@brimveyn/aimux 1.20.1 → 1.20.2

package/src/cli/commands/worker/prompt.ts

@@ -6,17 +6,25 @@ import { DEFAULT_TIMEOUT_MS } from '../tab/await-turn'
 import { resolvePromptText } from '../tab/prompt-io'
 import {
   dispatchWorkerPrompt,
-  resolveWorkerTab,
+  resolveWorkerTarget,
   workerEnvelope,
   workerOutcomeExitCode,
   workerView,
 } from './shared'
 
 export const workerPrompt: CliCommand = {
-  args: [{ name: 'worker', required: true }, { name: 'text' }],
+  args: [
+    { complete: { kind: 'dynamic', source: 'worker' }, name: 'worker', required: true },
+    { complete: { kind: 'none' }, name: 'text' },
+  ],
   flags: [
     ...SHARED_FLAGS,
-    { description: 'read the prompt from this file', kind: 'string', name: 'prompt-file' },
+    {
+      complete: { kind: 'file' },
+      description: 'read the prompt from this file',
+      kind: 'string',
+      name: 'prompt-file',
+    },
     { description: 'read the prompt from stdin', kind: 'boolean', name: 'stdin' },
     {
       description: 'return after prompt uptake instead of turn completion',
@@ -24,11 +32,23 @@ export const workerPrompt: CliCommand = {
       name: 'detach',
     },
     { description: 'overall turn cap in milliseconds', kind: 'number', name: 'timeout' },
+    {
+      description:
+        'milliseconds to wait for the detached submit→working confirmation (default 15000)',
+      kind: 'number',
+      name: 'uptake-timeout',
+    },
+    {
+      description:
+        'clear the composer (<C-u>) before writing, so text typed by a human in the UI cannot be concatenated onto this prompt',
+      kind: 'boolean',
+      name: 'replace',
+    },
   ],
   group: 'worker',
   run: async (ctx) => {
     const selector = ctx.args.positionals[0] ?? ''
-    const tab = await resolveWorkerTab(ctx, selector)
+    const { tab, workspace } = await resolveWorkerTarget(ctx, selector)
     const promptFile =
       typeof ctx.args.flags['prompt-file'] === 'string' ? ctx.args.flags['prompt-file'] : undefined
     const text = await resolvePromptText(
@@ -36,12 +56,17 @@ export const workerPrompt: CliCommand = {
       ctx.args.flags.stdin === true,
       ctx.args.positionals[1]
     )
-    const outcome = await dispatchWorkerPrompt(ctx, tab.id, text, {
+    const outcome = await dispatchWorkerPrompt(ctx, workspace, tab.id, text, {
       detach: ctx.args.flags.detach === true,
+      replace: ctx.args.flags.replace === true,
       timeoutMs:
         typeof ctx.args.flags.timeout === 'number' ? ctx.args.flags.timeout : DEFAULT_TIMEOUT_MS,
+      uptakeTimeoutMs:
+        typeof ctx.args.flags['uptake-timeout'] === 'number'
+          ? ctx.args.flags['uptake-timeout']
+          : undefined,
     })
-    writeJson(workerEnvelope(workerView(ctx, tab), outcome))
+    writeJson(workerEnvelope(workspace, workerView(workspace, tab), outcome))
     return workerOutcomeExitCode(outcome)
   },
   summary: 'Prompt an existing named worker and await its outcome',

package/src/cli/commands/worker/run.ts

@@ -14,22 +14,39 @@ import {
 } from './shared'
 
 export const workerRun: CliCommand = {
-  args: [{ name: 'text' }],
+  args: [{ complete: { kind: 'none' }, name: 'text' }],
   flags: [
     ...SHARED_FLAGS,
-    { description: 'unique workspace-scoped worker name', kind: 'string', name: 'name' },
     {
+      complete: { kind: 'none' },
+      description: 'unique workspace-scoped worker name',
+      kind: 'string',
+      name: 'name',
+    },
+    {
+      complete: { kind: 'dynamic', source: 'assistant' },
       description: 'assistant id (claude, codex, opencode, ...)',
       kind: 'string',
       name: 'assistant',
     },
-    { description: 'model passed through to the assistant', kind: 'string', name: 'model' },
     {
+      complete: { kind: 'none' },
+      description: 'model passed through to the assistant',
+      kind: 'string',
+      name: 'model',
+    },
+    {
+      complete: { kind: 'none' },
       description: 'reasoning effort passed through to the assistant',
       kind: 'string',
       name: 'effort',
     },
-    { description: 'read the prompt from this file', kind: 'string', name: 'prompt-file' },
+    {
+      complete: { kind: 'file' },
+      description: 'read the prompt from this file',
+      kind: 'string',
+      name: 'prompt-file',
+    },
     { description: 'read the prompt from stdin', kind: 'boolean', name: 'stdin' },
     {
       description: 'return after prompt uptake instead of turn completion',
@@ -37,14 +54,31 @@ export const workerRun: CliCommand = {
       name: 'detach',
     },
     { description: 'overall turn cap in milliseconds', kind: 'number', name: 'timeout' },
-    { description: 'co-locate in an existing worktree id', kind: 'string', name: 'worktree' },
+    {
+      description:
+        'milliseconds to wait for the detached submit→working confirmation (default 15000)',
+      kind: 'number',
+      name: 'uptake-timeout',
+    },
+    {
+      complete: { kind: 'dynamic', source: 'worktree' },
+      description: 'co-locate in an existing worktree id',
+      kind: 'string',
+      name: 'worktree',
+    },
     {
       description: 'run in the workspace active worktree instead of creating one',
       kind: 'boolean',
       name: 'no-worktree',
     },
-    { description: 'base ref for the fresh worktree (default HEAD)', kind: 'string', name: 'base' },
     {
+      complete: { kind: 'dynamic', source: 'git-ref' },
+      description: 'base ref for the fresh worktree (default HEAD)',
+      kind: 'string',
+      name: 'base',
+    },
+    {
+      complete: { kind: 'none' },
       description: 'branch for the fresh worktree (default aimux/<name>)',
       kind: 'string',
       name: 'branch',
@@ -69,6 +103,11 @@ export const workerRun: CliCommand = {
       ctx.args.flags.stdin === true,
       ctx.args.positionals[0]
     )
+    // Resolve the target workspace ONCE, up front, and use that record for
+    // every later step. The repo a worktree is cut from comes from this record,
+    // so an orchestrator that omits --workspace at least gets the resolved
+    // identity echoed back in the response instead of having to infer it.
+    const workspace = ctx.getWorkspace()
     const result = await createCliTab(ctx, {
       assistantId: assistant,
       base: typeof ctx.args.flags.base === 'string' ? ctx.args.flags.base : undefined,
@@ -80,16 +119,23 @@ export const workerRun: CliCommand = {
       workerName: name,
       worktreeId: worktree,
     })
-    const tabs = await (await ctx.getDaemon()).listTabs(ctx.getWorkspace().id)
+    const tabs = await (await ctx.getDaemon()).listTabs(workspace.id)
     const tab = tabs.tabs.find((entry) => entry.id === result.tabId)
     if (!tab) throw new Error(`created worker disappeared: ${result.tabId}`)
-    const worker = workerView(ctx, tab)
-    const outcome = await dispatchWorkerPrompt(ctx, result.tabId, text, {
+    const worker = workerView(workspace, tab)
+    const outcome = await dispatchWorkerPrompt(ctx, workspace, result.tabId, text, {
+      // The tab was spawned microseconds ago: its assistant is still booting, so
+      // the prompt must not be written until the TUI is reading keystrokes.
+      awaitFirstPaint: true,
       detach: ctx.args.flags.detach === true,
       timeoutMs:
         typeof ctx.args.flags.timeout === 'number' ? ctx.args.flags.timeout : DEFAULT_TIMEOUT_MS,
+      uptakeTimeoutMs:
+        typeof ctx.args.flags['uptake-timeout'] === 'number'
+          ? ctx.args.flags['uptake-timeout']
+          : undefined,
     })
-    writeJson(workerEnvelope(worker, outcome))
+    writeJson(workerEnvelope(workspace, worker, outcome))
     return workerOutcomeExitCode(outcome)
   },
   summary: 'Create a named worker, dispatch a prompt, and await its outcome',