@crewx/cli 0.9.0-rc.10 → 0.9.0-rc.100

package/dist/commands/query.js

@@ -6,6 +6,7 @@
  * Flags:
  *   --thread <name>          Conversation thread name
  *   --provider <cli/xxx>     Provider override
+ *   --model <name>           Model override (e.g. claude-sonnet-5)
  *   --metadata <json>        Extra metadata JSON (double-quoted object). Propagated to events/hooks/tracing.
  *                           e.g. --metadata='{"workflow_id":"wf-1"}'
  *   --verbose                Debug output mode (default: raw agent response only)
@@ -13,6 +14,8 @@
  *   --output-format <fmt>    Output format (json|text|stream-json)
  *   --effort <level>         Model effort (high|medium|low)
  *   -f/--prompt-file <path>  Read prompt body from file (bypasses cmd.exe argv truncation)
+ *   --detach/--async         Persist a receipt and launch a detached runner
+ *   --wait                   Force synchronous execution
  *
  * Stdin support:
  *   Pipe or redirect content into crewx q to supply the prompt body via stdin.
@@ -22,24 +25,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleQuery = handleQuery;
 const sdk_1 = require("@crewx/sdk");
+const repository_1 = require("@crewx/sdk/repository");
 const parse_agent_message_1 = require("./parse-agent-message");
 const parse_common_flags_1 = require("./parse-common-flags");
 const resolve_prompt_1 = require("./resolve-prompt");
 const crewx_cli_1 = require("../bootstrap/crewx-cli");
 const inherited_trace_1 = require("../utils/inherited-trace");
+const write_output_1 = require("./write-output");
+const detached_1 = require("./detached");
+const emit_trailer_1 = require("./emit-trailer");
 /**
  * Handle `crewx query <agentRef> <message>` command.
  *
  * Default output: raw agent response only (stdout).
  * --verbose: debug info written to stderr, response to stdout.
  */
-async function handleQuery(args) {
-    const { thread, provider, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, rest } = (0, parse_common_flags_1.parseCommonFlags)(args);
-    const { agentRef: parsedAgentRef, message } = (0, parse_agent_message_1.parseAgentMessage)(rest);
-    // No @mention → default to @crewx agent (matches cli-bak behaviour)
+async function handleQuery(args, command = 'query', emitState = (0, emit_trailer_1.createDelegationEmitState)()) {
+    // The private middle-hop marker is consumed before public flag parsing. An
+    // invalid direct use remains an unknown option and is rejected normally.
+    const middleHop = (0, detached_1.readDetachedMiddleHop)(args);
+    if (middleHop) {
+        await (0, detached_1.runDetachedMiddle)(command, middleHop);
+        return;
+    }
+    const receiptFlags = (0, detached_1.extractReceiptFlags)(args);
+    const receiptMode = (0, detached_1.resolveReceiptMode)({
+        detach: receiptFlags.detach,
+        wait: receiptFlags.wait,
+        detachedRunner: (0, inherited_trace_1.isDetachedRunner)(),
+        agentContext: Boolean(process.env['CREWX_AGENT_ID']),
+    });
+    if (receiptMode.receipt) {
+        await (0, detached_1.runDetached)(command, receiptFlags.rest, receiptMode.reason);
+        return;
+    }
+    let parsedFlags;
+    try {
+        parsedFlags = (0, parse_common_flags_1.parseCommonFlags)(receiptFlags.rest);
+    }
+    catch (err) {
+        (0, emit_trailer_1.emitDelegationResult)({ command, isError: true, state: emitState });
+        throw err;
+    }
+    const { thread, provider, model, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, out, rest } = parsedFlags;
+    const inheritedTrace = (0, inherited_trace_1.readInheritedTrace)();
+    let parsedAgentRef;
+    let message;
+    let finalMessage;
+    try {
+        ({ agentRef: parsedAgentRef, message } = (0, parse_agent_message_1.parseAgentMessage)(rest));
+        // Resolve final prompt: argv | stdin pipe | --prompt-file (or combination)
+        finalMessage = await (0, resolve_prompt_1.resolvePrompt)(message, promptFile);
+    }
+    catch (err) {
+        (0, emit_trailer_1.emitDelegationResult)({ command, trace: inheritedTrace, isError: true, state: emitState });
+        throw err;
+    }
     const agentRef = parsedAgentRef || '@crewx';
-    // Resolve final prompt: argv | stdin pipe | --prompt-file (or combination)
-    const finalMessage = await (0, resolve_prompt_1.resolvePrompt)(message, promptFile);
     if (!finalMessage) {
         console.error('Usage: crewx query [@agent] <message> [options]');
         console.error('       crewx q [@agent] <message> [options]');
@@ -55,6 +97,7 @@ async function handleQuery(args) {
         console.error('Options:');
         console.error('  --thread <name>           Conversation thread name');
         console.error('  --provider <cli/xxx>      Provider override');
+        console.error('  --model <name>            Model override (e.g. claude-sonnet-5)');
         console.error('  --metadata <json>         Extra metadata (JSON object, double-quoted).');
         console.error('                            Propagated to events/hooks/tracing.');
         console.error('                            Invalid JSON aborts with exit code 2.');
@@ -62,24 +105,37 @@ async function handleQuery(args) {
         console.error('  --verbose                 Debug output mode');
         console.error('  --config/-c <path>        Config file path');
         console.error('  --output-format <fmt>     Output format (json|text|stream-json)');
+        console.error('  --out/-o <path>           Save result to file (stdout suppressed)');
         console.error('  --effort <level>          Model effort (high|medium|low)');
         console.error('  -f/--prompt-file <path>   Read prompt body from file');
         console.error('  --var key=value           Template variable (repeatable)');
         console.error('  --overdrive               Activate overdrive (boost) profile for this request');
+        (0, emit_trailer_1.emitDelegationResult)({ command, trace: inheritedTrace, isError: true, state: emitState });
         process.exit(1);
+        return;
     }
     const configPath = config ?? process.env.CREWX_CONFIG ?? 'crewx.yaml';
     // Only show exec audit span JSON in verbose mode
     (0, sdk_1.setAuditVerbose)(verbose);
-    const crewx = await (0, crewx_cli_1.createCliCrewx)(configPath);
+    let crewx;
+    try {
+        crewx = await (0, crewx_cli_1.createCliCrewx)(configPath);
+    }
+    catch (err) {
+        (0, emit_trailer_1.emitDelegationResult)({ command, trace: inheritedTrace, isError: true, state: emitState });
+        throw err;
+    }
     // file:// remote agent delegation is handled transparently inside Crewx.query/execute.
     if (verbose) {
+        process.stderr.write(`mode=sync reason=${receiptMode.reason}\n`);
         process.stderr.write(`📋 Task: ${finalMessage}\n`);
         process.stderr.write(`🤖 Agent: ${agentRef}\n`);
         if (thread)
             process.stderr.write(`🔗 Thread: ${thread}\n`);
         if (provider)
             process.stderr.write(`🔌 Provider: ${provider}\n`);
+        if (model)
+            process.stderr.write(`🧠 Model: ${model}\n`);
         if (outputFormat)
             process.stderr.write(`📄 Output-format: ${outputFormat}\n`);
         if (effort)
@@ -95,22 +151,43 @@ async function handleQuery(args) {
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         process.stderr.write(`Error: ${msg}\n`);
+        (0, emit_trailer_1.emitDelegationResult)({ command, trace: inheritedTrace, isError: true, state: emitState });
         process.exit(2);
+        return;
+    }
+    // Only the detached runner may adopt a pre-issued task row. Trace variables
+    // describe the caller chain and are never used as this task's identity.
+    const detachedRunner = (0, inherited_trace_1.isDetachedRunner)();
+    const assignedTaskId = (0, inherited_trace_1.readRunnerAssignment)();
+    let selfTaskId;
+    if (assignedTaskId !== undefined) {
+        const adoption = (0, detached_1.adoptAssignedTask)(new repository_1.TaskRepository(), assignedTaskId, detachedRunner);
+        if (adoption.kind === 'failed') {
+            (0, emit_trailer_1.emitDelegationResult)({ command, trace: inheritedTrace, isError: true, state: emitState });
+            process.exit(1);
+            return;
+        }
+        if (adoption.kind === 'adopted')
+            selfTaskId = adoption.taskId;
     }
     let exitCode = 0;
+    let result;
     try {
-        const result = await crewx.query(agentRef, finalMessage, {
+        result = await crewx.query(agentRef, finalMessage, {
             provider,
+            model,
             effort: effort || undefined,
             overdrive: overdrive || undefined,
             threadId: thread,
+            taskId: selfTaskId,
             metadata: Object.keys(parsedMetadata).length > 0 ? parsedMetadata : undefined,
             vars: Object.keys(vars).length > 0 ? vars : undefined,
-            trace: (0, inherited_trace_1.readInheritedTrace)(),
+            trace: inheritedTrace,
         });
         if (!result.ok) {
             const errMsg = result.error?.message ?? 'Query failed';
             console.error(errMsg);
+            (0, write_output_1.appendError)(out, errMsg);
             exitCode = 1;
         }
         else {
@@ -123,7 +200,7 @@ async function handleQuery(args) {
                 process.stderr.write('\n📄 Response:\n');
                 process.stderr.write('─'.repeat(40) + '\n');
             }
-            console.log(result.data);
+            (0, write_output_1.writeResult)(out, result.data);
             if (verbose) {
                 process.stderr.write('\n✅ Query completed successfully\n');
             }
@@ -132,11 +209,33 @@ async function handleQuery(args) {
     catch (err) {
         const errMsg = err instanceof Error ? err.message : String(err);
         console.error(`Error: ${errMsg}`);
+        (0, write_output_1.appendError)(out, `Error: ${errMsg}`);
         exitCode = 1;
     }
     finally {
-        await crewx.close();
+        try {
+            await crewx.close();
+        }
+        catch (err) {
+            (0, emit_trailer_1.emitDelegationResult)({
+                command,
+                trace: inheritedTrace,
+                taskId: result?.meta.taskId,
+                agentId: result?.meta.agentId,
+                isError: true,
+                state: emitState,
+            });
+            throw err;
+        }
     }
+    (0, emit_trailer_1.emitDelegationResult)({
+        command,
+        trace: inheritedTrace,
+        taskId: result?.meta.taskId,
+        agentId: result?.meta.agentId,
+        isError: exitCode !== 0 || result?.ok === false,
+        state: emitState,
+    });
     if (exitCode !== 0)
         process.exit(exitCode);
 }

package/dist/commands/registry.js

@@ -13,17 +13,19 @@ exports.KNOWN_COMMANDS = new Set([
     'q', 'query',
     'x', 'execute',
     'agent',
-    'ps', 'kill', 'result', 'log', 'restart',
+    'ps', 'stop', 'kill', 'result', 'log', 'restart',
     'doctor', 'init',
     'db',
     'help',
+    'shortcut',
+    'publish',
     'slack', 'slack:files',
     'hook', 'hook-dispatch',
 ]);
 /** Built-in tool commands routed via handleBuiltin(). */
 exports.BUILTIN_COMMAND_NAMES = new Set([
     'memory', 'search', 'doc', 'wbs', 'cron', 'workflow', 'skill', 'dreaming',
-    'wi', 'chromex',
+    'wi', 'chromex', 'notify',
 ]);
 /** Commands not yet migrated from cli-bak — show a migration message. */
 exports.NOT_YET_MIGRATED = new Set([

package/dist/commands/result.d.ts

@@ -3,8 +3,13 @@
  * Retrieves the result of a completed task by its ID.
  *
  * Usage:
- *   crewx result <task-id>         Print raw result
- *   crewx result <task-id> --json  Print full task record as JSON
- *   crewx result                   List recent tasks (latest 10)
+ *   crewx result <task-id>            Print raw result
+ *   crewx result <task-id> --json     Print full task record as JSON
+ *   crewx result <task-id> --wait=<seconds> Poll (1s interval) up to the given
+ *                                    number of seconds for
+ *                                    the task to leave 'pending'/'running'. Exit 124 on
+ *                                    timeout. --wait=0 behaves like no --wait
+ *                                    (single immediate check).
+ *   crewx result                      List recent tasks (latest 10)
  */
 export declare function handleResult(args: string[]): Promise<void>;

package/dist/commands/result.js

@@ -4,25 +4,95 @@
  * Retrieves the result of a completed task by its ID.
  *
  * Usage:
- *   crewx result <task-id>         Print raw result
- *   crewx result <task-id> --json  Print full task record as JSON
- *   crewx result                   List recent tasks (latest 10)
+ *   crewx result <task-id>            Print raw result
+ *   crewx result <task-id> --json     Print full task record as JSON
+ *   crewx result <task-id> --wait=<seconds> Poll (1s interval) up to the given
+ *                                    number of seconds for
+ *                                    the task to leave 'pending'/'running'. Exit 124 on
+ *                                    timeout. --wait=0 behaves like no --wait
+ *                                    (single immediate check).
+ *   crewx result                      List recent tasks (latest 10)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleResult = handleResult;
+const sdk_1 = require("@crewx/sdk");
 const repository_1 = require("@crewx/sdk/repository");
+const cal_1 = require("./cal");
+const POLL_INTERVAL_MS = 1000;
+const REAP_INTERVAL_MS = 10_000;
 function statusIcon(status) {
     switch (status) {
+        case 'pending': return '🕓';
         case 'running': return '⏳';
         case 'success': return '✅';
         case 'failed': return '❌';
+        case 'stopped': return '⏹';
+        case 'runner_lost': return '⚠️';
         default: return '❓';
     }
 }
+function isActiveStatus(status) {
+    return status === 'pending' || status === 'running';
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function resultCommandId(status) {
+    switch (status) {
+        case 'pending': return 'crewx.result-pending';
+        case 'running': return 'crewx.result-running';
+        case 'success': return 'crewx.result-done';
+        case 'failed':
+        case 'stopped':
+        case 'runner_lost':
+            return 'crewx.result-terminal-abnormal';
+        default: return 'crewx.result';
+    }
+}
+function writeResultCalFooter(task, lastWaitSeconds) {
+    const params = { taskId: task.id };
+    if (task.agent_id)
+        params.agent = task.agent_id;
+    if (task.thread_id)
+        params.thread = task.thread_id;
+    if (isActiveStatus(task.status)) {
+        params.wait = String((0, cal_1.suggestWaitSeconds)({
+            startedAt: task.started_at,
+            lastWaitSeconds,
+        }));
+    }
+    (0, cal_1.writeCalFooter)({ commandId: resultCommandId(task.status), params });
+}
+function formatRuntimeDuration(startedAt, now = Date.now()) {
+    const startedAtMs = Date.parse(startedAt);
+    const elapsedSeconds = Number.isFinite(startedAtMs)
+        ? Math.max(0, Math.floor((now - startedAtMs) / 1000))
+        : 0;
+    const hours = Math.floor(elapsedSeconds / 3600);
+    const minutes = Math.floor((elapsedSeconds % 3600) / 60);
+    const seconds = elapsedSeconds % 60;
+    if (hours > 0)
+        return `${hours}h ${minutes}m ${seconds}s`;
+    if (minutes > 0)
+        return `${minutes}m ${seconds}s`;
+    return `${seconds}s`;
+}
+/** Parses `--wait=<seconds>`. Returns undefined when the flag is absent. */
+function parseWaitSeconds(args) {
+    const arg = args.find(a => a.startsWith('--wait='));
+    if (arg === undefined)
+        return undefined;
+    const n = Number(arg.slice('--wait='.length));
+    return Number.isFinite(n) && n >= 0 ? n : 0;
+}
 async function handleResult(args) {
     const jsonMode = args.includes('--json');
+    const waitSeconds = parseWaitSeconds(args);
     const taskId = args.find(a => !a.startsWith('--'));
     const repo = new repository_1.TaskRepository();
+    const initialReaped = repo.reapOrphanedTasks({ tickIntervalMs: REAP_INTERVAL_MS });
+    if (initialReaped > 0)
+        console.error(`Reaped ${initialReaped} orphaned task(s)`);
     if (!taskId) {
         const all = repo.getAllTasks();
         const recent = all.slice(0, 10);
@@ -36,35 +106,97 @@ async function handleResult(args) {
             const icon = statusIcon(task.status);
             console.log(`${idx + 1}. ${icon} ${task.id}`);
             console.log(`   Agent: ${task.agent_id ?? '—'}  Mode: ${task.mode ?? '—'}`);
-            console.log(`   Started: ${new Date(task.started_at).toLocaleString()}`);
+            console.log(`   Started: ${(0, sdk_1.formatDisplayTimestamp)(new Date(task.started_at))}`);
             if (task.completed_at) {
-                console.log(`   Completed: ${new Date(task.completed_at).toLocaleString()}`);
+                console.log(`   Completed: ${(0, sdk_1.formatDisplayTimestamp)(new Date(task.completed_at))}`);
             }
             console.log('');
         });
         console.log('Tip: Run `crewx result <task-id>` to see full output.');
+        if (!jsonMode)
+            writeResultCalFooter(recent[0]);
         return;
     }
-    const task = repo.getTask(taskId);
+    let task = repo.getTask(taskId);
     if (!task) {
         console.error(`Error: Task not found: ${taskId}`);
         process.exit(1);
         return;
     }
+    if (waitSeconds !== undefined && waitSeconds > 0 && isActiveStatus(task.status)) {
+        const deadline = Date.now() + waitSeconds * 1000;
+        let lastReapAt = Date.now();
+        while (task && isActiveStatus(task.status)) {
+            if (Date.now() >= deadline) {
+                console.error(`Task ${taskId} is still ${task.status} (waited ${waitSeconds}s; ` +
+                    `running for ${formatRuntimeDuration(task.started_at)}). ` +
+                    'Not stalled — check again with a longer wait.');
+                writeResultCalFooter(task, waitSeconds);
+                process.exit(124);
+                return;
+            }
+            await sleep(Math.min(POLL_INTERVAL_MS, Math.max(0, deadline - Date.now())));
+            if (Date.now() - lastReapAt >= REAP_INTERVAL_MS) {
+                const reaped = repo.reapOrphanedTasks({ tickIntervalMs: REAP_INTERVAL_MS });
+                if (reaped > 0)
+                    console.error(`Reaped ${reaped} orphaned task(s)`);
+                lastReapAt = Date.now();
+            }
+            task = repo.getTask(taskId);
+            if (!task) {
+                console.error(`Error: Task not found: ${taskId}`);
+                process.exit(1);
+                return;
+            }
+        }
+    }
     if (jsonMode) {
         console.log(JSON.stringify(task, null, 2));
         return;
     }
+    if (task.status === 'pending') {
+        console.error(`🕓 Task ${taskId} is pending (waiting to start — runner has not adopted the task yet).`);
+        const nextWaitSeconds = (0, cal_1.suggestWaitSeconds)({
+            startedAt: task.started_at,
+            lastWaitSeconds: waitSeconds,
+        });
+        console.error(`Use \`crewx result ${taskId} --wait=${nextWaitSeconds}\` to wait for completion.`);
+        writeResultCalFooter(task, waitSeconds);
+        process.exit(1);
+        return;
+    }
     if (task.status === 'running') {
         console.error(`Task ${taskId} is still running.`);
-        console.error(`Use \`crewx kill ${taskId}\` to stop it.`);
+        const nextWaitSeconds = (0, cal_1.suggestWaitSeconds)({
+            startedAt: task.started_at,
+            lastWaitSeconds: waitSeconds,
+        });
+        console.error(`Use \`crewx result ${taskId} --wait=${nextWaitSeconds}\` to wait longer or \`crewx log ${taskId}\` to inspect progress.`);
+        writeResultCalFooter(task, waitSeconds);
+        process.exit(1);
+        return;
+    }
+    if (task.status === 'stopped') {
+        if (task.result !== null && task.result !== undefined) {
+            console.log(task.result);
+        }
+        console.error(`⏹ Task ${taskId} was stopped by user: ${task.error ?? 'no further details'}.`);
+        writeResultCalFooter(task);
+        process.exit(1);
+        return;
+    }
+    if (task.status === 'runner_lost') {
+        console.error(`⚠️ Task ${taskId} runner lost before completion: ${task.error ?? 'no further details'}.`);
+        writeResultCalFooter(task);
         process.exit(1);
         return;
     }
     if (task.status === 'failed') {
         console.error(`Task ${taskId} failed: ${task.error ?? 'unknown error'}`);
+        writeResultCalFooter(task);
         process.exit(1);
         return;
     }
     console.log(task.result ?? '');
+    writeResultCalFooter(task);
 }

package/dist/commands/shortcut.d.ts

@@ -0,0 +1 @@
+export declare function handleShortcut(args: string[]): Promise<void>;