mirror of
https://github.com/stablyai/orca.git
synced 2026-11-05 19:47:27 +00:00
Neil
90801e2deb
* feat(agents): add first-class ZCode harness Add ZCode (Z.ai's `zcode` CLI) as a supervised Orca agent: managed lifecycle hooks on local, SSH and Windows hosts; status, question and approval reporting; synthetic status titles; session resume; orchestration worker launch options; and desktop + mobile agent-picker registration. Written against the newly open-sourced `zai-org/ZCode` (agent CLI 0.16.9), not against a remembered screen: - ZCode's hook runner writes a Claude-compatible stdin alias set, so it routes through the existing Claude-compatible vendor path while keeping its own identity in the sidebar. - `PermissionRequest` fires only once the approval card is on screen and racing the user's answer, so it is proof the pane is blocked, not an auto-approval. - ZCode's clarification tool is literally `AskUserQuestion` with Claude's questions/options shape, so Orca's question card renders it unchanged. - ZCode's `hooks.enabled` defaults to false, which is why configured hooks were reported as never firing; the installer sets it. - ZCode renames its own process to `zcode-cli`, so the expected foreground process cannot be the launch command or dispatch refuses the pane. - ZCode emits no OSC title in any state and repaints its ASCII banner forever, so readiness comes from Orca's synthetic hook title and launch drafts wait on the composer box rather than on a quiet render window. Three files crossed their max-lines limit, so each is split along a real seam: command-line entrypoint parsing out of agent process recognition, skill classification out of skill root discovery, and registry coverage out of the remote hook installer tests. Refs #10564 * fix(zcode): drop the session-option catalog and pin the orchestration contract ZCode's CLI exposes no `--model` flag at all, and the session-option launch path refuses to apply any option until a model id is chosen. A catalog therefore could not deliver `--mode` per worker, and would have accepted `--model` only to drop it silently. Take opencode's position instead: no catalog, so `worker-start --model` is refused with a clear message and ZCode launches with the model from its own config. `--mode` stays reachable through agent args, which is also how the yolo default is applied. Add a contract test covering the parts that make ZCode a usable worker: dispatchable foreground process, stdin prompt delivery, the prompt staying out of the launch command, and the composer-gated draft paste. * refactor(zcode): reuse shared helpers and cut the harness down No behaviour change; every ZCode test still passes. - Use installer-utils' own `hookDefinitionHasManagedCommand` instead of re-walking a hook definition by hand, which also drops a local string reader. - Share one `readZCodeEventMap` instead of keeping the same narrowing in both hook-settings and hook-config-json. - Collapse five identical error returns into one `zcodeHookError` builder, and return early from the status branches instead of assigning through `let`. - Split the event-to-status decision out of `normalizeZCodeEvent` into a pure `readZCodeTurn`, so the normalizer reads as decide-then-build and stops computing the tool name for events that never look at it. - Take a script file name in `readManagedZCodeHookEvents` like its siblings, which removes a `Parameters<typeof …>` indirection at the call site. - Drop the unused `ZCodeHookEvent` export and inline a single-use path helper. - Correct a stale comment: ZCode's loader is a strict `JSON.parse`, so the in-place edit preserves key order and indentation, not comments. * fix(zcode): address review — keep unmanaged event keys, correct comment, de-dupe README - `removeZCodeManagedHooks` deleted any event key whose list ended up empty, so an unrelated `"Notification": []` the user wrote was removed as collateral whenever a managed hook elsewhere made the write happen. Only touch an event Orca actually owned something in; covered by a new regression test. - The `isNewTurnEvent` comment claimed UserPromptSubmit was ZCode's only turn boundary while the expression below it also returned true for SessionStart. Say what the code does: SessionStart lands the idle boundary, UserPromptSubmit is the turn boundary (the Codex/Claude shape). - ZCode appeared twice in the README's single agent-badge block; keep the local-icon entry the link checker validates and drop the favicon duplicate. * docs(zcode): call out that the desktop bundle's CLI cannot open a session From live testing on #22464: pointing `zcode` at the desktop app's bundled `glm/zcode.cjs` installs Orca's hooks fine but then fails with `Cannot find package '@zcode/tui'`, so the pane never opens a session. The symptom reads as a broken harness when the CLI simply has no TUI. Say which build to use and how to check before reporting a problem. Reported-by: JWu527
79 lines
2.6 KiB
TypeScript
79 lines
2.6 KiB
TypeScript
// Mapping from the renderer's `TuiAgent` union (every agent Orca knows how
|
|
// to launch) to the closed `agentKindSchema` enum on telemetry events. Every
|
|
// shipped agent maps to a concrete telemetry value so dashboards can
|
|
// distinguish launch interest instead of collapsing the long tail to `other`.
|
|
//
|
|
// Lives in `src/shared/` (not the renderer) because main-side telemetry
|
|
// emission (`agent_started` from the `pty:spawn` IPC handler) needs the
|
|
// same mapping. Centralizing here means a new TuiAgent member is one edit,
|
|
// not a sweep across renderer + main.
|
|
|
|
import type { AgentKind } from './telemetry-events'
|
|
import type { TuiAgent } from './tui-agent'
|
|
|
|
type ConcreteAgentKind = Exclude<AgentKind, 'other'>
|
|
|
|
const TUI_AGENT_KIND_BY_AGENT = {
|
|
claude: 'claude-code',
|
|
'claude-agent-teams': 'claude-agent-teams',
|
|
openclaude: 'openclaude',
|
|
codex: 'codex',
|
|
autohand: 'autohand',
|
|
opencode: 'opencode',
|
|
opencode2: 'opencode2',
|
|
'mimo-code': 'mimo-code',
|
|
pi: 'pi',
|
|
omp: 'omp',
|
|
'prime-agent': 'prime-agent',
|
|
gemini: 'gemini',
|
|
antigravity: 'antigravity',
|
|
aider: 'aider',
|
|
goose: 'goose',
|
|
amp: 'amp',
|
|
kilo: 'kilo',
|
|
kiro: 'kiro',
|
|
crush: 'crush',
|
|
aug: 'aug',
|
|
cline: 'cline',
|
|
codebuff: 'codebuff',
|
|
'command-code': 'command-code',
|
|
continue: 'continue',
|
|
cursor: 'cursor',
|
|
droid: 'droid',
|
|
kimi: 'kimi',
|
|
'mistral-vibe': 'mistral-vibe',
|
|
'qwen-code': 'qwen-code',
|
|
rovo: 'rovo',
|
|
hermes: 'hermes',
|
|
openclaw: 'openclaw',
|
|
copilot: 'copilot',
|
|
grok: 'grok',
|
|
devin: 'devin',
|
|
ante: 'ante',
|
|
trae: 'trae',
|
|
muse: 'muse',
|
|
zcode: 'zcode'
|
|
} satisfies Record<TuiAgent, ConcreteAgentKind>
|
|
|
|
// Why: `satisfies Record<TuiAgent, …>` makes the lookup exhaustive at compile
|
|
// time, but stale persisted settings or unsafe IPC casts can carry a string
|
|
// outside the union at runtime — fall back to `'other'` so the event still
|
|
// emits instead of failing validation and dropping silently.
|
|
export function tuiAgentToAgentKind(agent: TuiAgent): AgentKind {
|
|
return TUI_AGENT_KIND_BY_AGENT[agent] ?? 'other'
|
|
}
|
|
|
|
// Why: the worktree-initial-terminal launch path only carries the telemetry
|
|
// `agent_kind`, not the TuiAgent. Reverse the map so that path can stamp the
|
|
// tab's launch agent without threading TuiAgent through every startup builder.
|
|
const AGENT_BY_TUI_AGENT_KIND: Partial<Record<AgentKind, TuiAgent>> = Object.fromEntries(
|
|
Object.entries(TUI_AGENT_KIND_BY_AGENT).map(([agent, kind]) => [kind, agent as TuiAgent])
|
|
)
|
|
|
|
export function agentKindToTuiAgent(kind: AgentKind | null | undefined): TuiAgent | null {
|
|
if (!kind) {
|
|
return null
|
|
}
|
|
return AGENT_BY_TUI_AGENT_KIND[kind] ?? null
|
|
}
|