@crewx/cli 0.9.0-rc.6 → 0.9.0-rc.60

package/dist/commands/ps.js

@@ -21,14 +21,54 @@ function formatElapsed(ms) {
     const h = Math.floor(m / 60);
     return `${h}h ${m % 60}m`;
 }
+/**
+ * Antigravity-family providers (coding_agent_command starting with 'agy',
+ * path-included forms like '/usr/local/bin/agy' also count) don't emit
+ * parseable logs, so they get a distinct 'n/a' instead of '—'.
+ */
+function isAgyCommand(codingAgentCommand) {
+    const cmd = (codingAgentCommand ?? '').trim();
+    if (!cmd)
+        return false;
+    const firstToken = cmd.split(/\s+/)[0] ?? '';
+    const base = firstToken.split('/').pop() ?? firstToken;
+    return base.startsWith('agy');
+}
+function getLastActive(task) {
+    try {
+        const entries = task.logs ? JSON.parse(task.logs) : [];
+        if (Array.isArray(entries) && entries.length > 0) {
+            const lastEntry = entries[entries.length - 1];
+            const ts = lastEntry?.timestamp;
+            const parsedMs = ts ? new Date(ts).getTime() : NaN;
+            if (ts && !Number.isNaN(parsedMs)) {
+                const diffMs = Math.max(0, Date.now() - parsedMs);
+                return {
+                    display: `${formatElapsed(diffMs)} ago`,
+                    isoTimestamp: ts,
+                    logCapable: true,
+                };
+            }
+        }
+    }
+    catch {
+        // fall through to antigravity/dash fallback below
+    }
+    if (isAgyCommand(task.coding_agent_command)) {
+        return { display: 'n/a', isoTimestamp: null, logCapable: false };
+    }
+    return { display: '—', isoTimestamp: null, logCapable: true };
+}
 function taskToRow(task) {
     const elapsed = formatElapsed(Date.now() - new Date(task.started_at).getTime());
+    const lastActive = getLastActive(task);
     return [
         task.id,
         task.agent_id ?? '—',
         task.pid !== null && task.pid !== undefined ? String(task.pid) : '—',
         elapsed,
         task.mode ?? '—',
+        lastActive.display,
     ];
 }
 function renderTable(headers, rows) {
@@ -43,16 +83,25 @@ function renderTable(headers, rows) {
 }
 async function handlePs(args) {
     const repo = new repository_1.TaskRepository();
+    repo.reapRunningWorkflowTasks();
     const tasks = repo.getRunningTasks();
     if (tasks.length === 0) {
         console.log('No running tasks.');
         return;
     }
     if (args.includes('--json')) {
-        console.log(JSON.stringify(tasks, null, 2));
+        const withLastActive = tasks.map((task) => {
+            const lastActive = getLastActive(task);
+            return {
+                ...task,
+                last_active_at: lastActive.isoTimestamp,
+                log_capable: lastActive.logCapable,
+            };
+        });
+        console.log(JSON.stringify(withLastActive, null, 2));
         return;
     }
-    const headers = ['TASK ID', 'AGENT', 'PID', 'ELAPSED', 'MODE'];
+    const headers = ['TASK ID', 'AGENT', 'PID', 'ELAPSED', 'MODE', 'LAST ACTIVE'];
     const rows = tasks.map(taskToRow);
     renderTable(headers, rows);
     console.log(`\n  ${tasks.length} running task(s)`);

package/dist/commands/publish.d.ts

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

package/dist/commands/publish.js

@@ -0,0 +1,270 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handlePublish = handlePublish;
+/**
+ * crewx publish handler — thin CLI wrapper over @crewx/sdk/publish.
+ *
+ * Usage:
+ *   crewx publish [dir] [--dry-run] [--version <semver>] [--json] [--upload]
+ *
+ * All scanning, exclusion-rule judgment, secret detection, hashing, and
+ * tar.gz packing lives in @crewx/sdk/publish (planPublish / packTemplate).
+ * Submit+upload (WI-SHR-20260806-013) lives in the same package
+ * (uploadToMarketplace) for the same reason — see that module's header.
+ * This command only parses argv, forwards options, reads auth.json
+ * (read-only — see readAuthJson()'s own doc), and renders the result.
+ */
+const fs = __importStar(require("fs"));
+const publish_1 = require("@crewx/sdk/publish");
+const parse_common_flags_1 = require("./parse-common-flags");
+function parsePublishFlags(args) {
+    const flags = { dryRun: false, json: false, help: false, upload: false };
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === '--help' || arg === '-h') {
+            flags.help = true;
+            continue;
+        }
+        if (arg === '--dry-run') {
+            flags.dryRun = true;
+            continue;
+        }
+        if (arg === '--json') {
+            flags.json = true;
+            continue;
+        }
+        if (arg === '--upload') {
+            flags.upload = true;
+            continue;
+        }
+        if (arg === '--version') {
+            const value = args[i + 1];
+            if (value === undefined)
+                throw new parse_common_flags_1.UnknownOptionError('--version requires a value');
+            flags.version = value;
+            i++;
+            continue;
+        }
+        if (arg.startsWith('--version=')) {
+            flags.version = arg.slice('--version='.length);
+            continue;
+        }
+        if (arg.startsWith('-')) {
+            throw new parse_common_flags_1.UnknownOptionError(`Unknown option: ${arg}`);
+        }
+        if (flags.dir === undefined) {
+            flags.dir = arg;
+            continue;
+        }
+        throw new parse_common_flags_1.UnknownOptionError(`Unknown option: ${arg}`);
+    }
+    return flags;
+}
+function resolveWorkspaceDir(flags) {
+    return flags.dir ?? process.env['CREWX_WORKSPACE'] ?? process.cwd();
+}
+function printJson(payload) {
+    console.log(JSON.stringify(payload));
+}
+/** Prints the error and exits 1. Never returns (matches `process.exit`'s `never` type). */
+function failWithError(err, json) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (json) {
+        printJson({ success: false, error: message });
+    }
+    else {
+        console.error(`✗ ${message}`);
+    }
+    process.exit(1);
+}
+function printHelp() {
+    console.log(`
+crewx publish — package a workspace as a distributable template archive
+
+Usage:
+  crewx publish [dir] [--dry-run] [--version <semver>] [--json] [--upload]
+
+Arguments:
+  dir              Workspace to publish (default: $CREWX_WORKSPACE or cwd)
+
+Options:
+  --dry-run        Scan + build manifest only; do not write a .tgz
+  --version <ver>  Override manifest version (semver, e.g. 1.0.0)
+  --json           Print machine-readable JSON to stdout
+  --upload         Submit + upload the packed archive to marketplace
+                    (requires CREWX_MARKETPLACE_URL and a prior login;
+                    ignored when combined with --dry-run)
+  --help, -h       Show this help
+
+Notes:
+  Without --upload, this command only scans the workspace, applies
+  exclusion rules, checks for secrets, and packs a local
+  .crewx/publish/<name>-<version>.tgz archive.
+`.trim());
+}
+/** CREWX_MARKETPLACE_URL — same env var name as the server's MARKETPLACE_DISABLED check, never a second name. */
+function requireMarketplaceUrl() {
+    const url = process.env['CREWX_MARKETPLACE_URL'];
+    if (!url) {
+        throw new Error('publish: [E_ENV_MISSING] CREWX_MARKETPLACE_URL is not set — this environment variable is required for upload');
+    }
+    return url;
+}
+async function handlePublish(args) {
+    const flags = parsePublishFlags(args);
+    if (flags.help) {
+        printHelp();
+        return;
+    }
+    const dir = resolveWorkspaceDir(flags);
+    process.stderr.write(`[publish] scanning ${dir}...\n`);
+    let plan;
+    try {
+        plan = await (0, publish_1.planPublish)(dir, { version: flags.version });
+    }
+    catch (err) {
+        failWithError(err, flags.json);
+    }
+    if (plan.secretFindings.length > 0) {
+        if (flags.json) {
+            printJson({ success: false, error: 'secret findings detected', findings: plan.secretFindings });
+        }
+        else {
+            console.error('✗ secret findings detected — publish aborted');
+            for (const f of plan.secretFindings) {
+                console.error(`  ${f.path}:${f.line} (${f.rule})`);
+            }
+        }
+        process.exit(1);
+    }
+    if (flags.dryRun) {
+        if (flags.json) {
+            printJson({
+                success: true,
+                dryRun: true,
+                workspace: dir,
+                manifest: plan.manifest,
+                included: plan.included,
+                excluded: plan.excluded,
+            });
+        }
+        else {
+            console.log('✓ dry-run — no archive written');
+            console.log(`  workspace: ${dir}`);
+            console.log(`  name: ${plan.manifest.name}  version: ${plan.manifest.version}`);
+            console.log(`  included: ${plan.included.length} files`);
+            console.log(`  excluded: ${plan.excluded.length} entries`);
+            for (const e of plan.excluded) {
+                console.log(`    ${e.path} (${e.rule})`);
+            }
+        }
+        return;
+    }
+    // Resolved before packing (not after) so a doomed --upload run (no
+    // marketplace url / no session) never writes a stray .tgz to the
+    // workspace — WI-SHR-20260806-013 AC-U5.
+    let marketplaceUrl = '';
+    let accessToken = '';
+    if (flags.upload) {
+        try {
+            marketplaceUrl = requireMarketplaceUrl();
+            accessToken = (0, publish_1.readAuthJson)().access_token;
+        }
+        catch (err) {
+            if (err instanceof Error && !err.message.startsWith('publish: [')) {
+                failWithError(new Error(`publish: [E_AUTH_EXPIRED] Authentication is missing or expired — please log in again — ${err.message}`), flags.json);
+            }
+            failWithError(err, flags.json);
+        }
+    }
+    process.stderr.write(`[publish] packing ${plan.manifest.name}@${plan.manifest.version}...\n`);
+    let packed;
+    try {
+        packed = await (0, publish_1.packTemplate)(dir, { version: flags.version });
+    }
+    catch (err) {
+        failWithError(err, flags.json);
+    }
+    const fileCount = packed.manifest.files.length;
+    const totalBytes = fs.statSync(packed.tgzPath).size;
+    let uploadResult;
+    if (flags.upload) {
+        process.stderr.write(`[publish] uploading ${packed.manifest.name}@${packed.manifest.version} to ${marketplaceUrl}...\n`);
+        try {
+            uploadResult = await (0, publish_1.uploadToMarketplace)({
+                tgzPath: packed.tgzPath,
+                manifest: packed.manifest,
+                baseUrl: marketplaceUrl,
+                accessToken,
+            });
+        }
+        catch (err) {
+            failWithError(err, flags.json);
+        }
+        process.stderr.write(`[publish] submit -> ${uploadResult.submitOutcome}\n`);
+    }
+    if (flags.json) {
+        printJson({
+            success: true,
+            tgzPath: packed.tgzPath,
+            fileCount,
+            totalBytes,
+            manifest: packed.manifest,
+            ...(uploadResult
+                ? {
+                    slug: uploadResult.slug,
+                    version: uploadResult.version,
+                    artifactChecksum: uploadResult.artifactChecksum,
+                    artifactSizeBytes: uploadResult.artifactSizeBytes,
+                    submitOutcome: uploadResult.submitOutcome,
+                    versionUpdate: uploadResult.versionUpdate,
+                    serverVersionBefore: uploadResult.serverVersionBefore,
+                }
+                : {}),
+        });
+    }
+    else {
+        console.log(`✓ packed: ${packed.tgzPath}`);
+        console.log(`  files: ${fileCount}  bytes: ${totalBytes}`);
+        if (uploadResult) {
+            console.log(`✓ uploaded: ${uploadResult.slug}@${uploadResult.version} (${uploadResult.submitOutcome})`);
+            console.log(`  artifactChecksum: ${uploadResult.artifactChecksum}  artifactSizeBytes: ${uploadResult.artifactSizeBytes}`);
+        }
+    }
+    if (!flags.upload) {
+        console.error('⚠ To upload, use --upload — check the generated file path');
+    }
+}

package/dist/commands/query.d.ts

@@ -5,6 +5,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)

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)
@@ -27,6 +28,7 @@ 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");
 /**
  * Handle `crewx query <agentRef> <message>` command.
  *
@@ -34,7 +36,7 @@ const inherited_trace_1 = require("../utils/inherited-trace");
  * --verbose: debug info written to stderr, response to stdout.
  */
 async function handleQuery(args) {
-    const { thread, provider, metadata, verbose, config, outputFormat, effort, promptFile, vars, rest } = (0, parse_common_flags_1.parseCommonFlags)(args);
+    const { thread, provider, model, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, out, 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)
     const agentRef = parsedAgentRef || '@crewx';
@@ -55,6 +57,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,9 +65,11 @@ 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');
         process.exit(1);
     }
     const configPath = config ?? process.env.CREWX_CONFIG ?? 'crewx.yaml';
@@ -79,10 +84,14 @@ async function handleQuery(args) {
             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)
             process.stderr.write(`⚡ Effort: ${effort}\n`);
+        if (overdrive)
+            process.stderr.write(`🚀 Overdrive: ON\n`);
         process.stderr.write('─'.repeat(60) + '\n');
     }
     let parsedMetadata = {};
@@ -98,7 +107,9 @@ async function handleQuery(args) {
     try {
         const result = await crewx.query(agentRef, finalMessage, {
             provider,
+            model,
             effort: effort || undefined,
+            overdrive: overdrive || undefined,
             threadId: thread,
             metadata: Object.keys(parsedMetadata).length > 0 ? parsedMetadata : undefined,
             vars: Object.keys(vars).length > 0 ? vars : undefined,
@@ -107,6 +118,7 @@ async function handleQuery(args) {
         if (!result.ok) {
             const errMsg = result.error?.message ?? 'Query failed';
             console.error(errMsg);
+            (0, write_output_1.appendError)(out, errMsg);
             exitCode = 1;
         }
         else {
@@ -119,7 +131,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');
             }
@@ -128,6 +140,7 @@ 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 {

package/dist/commands/registry.js

@@ -17,13 +17,15 @@ exports.KNOWN_COMMANDS = new Set([
     '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/restart.js

@@ -43,18 +43,23 @@ function buildRetryPrefix(originalTaskId) {
  * the string when present and non-empty, otherwise `undefined` so the
  * agent's configured provider default is used.
  */
-function extractProvider(metadata) {
+function parseTaskMetadata(metadata) {
     if (!metadata)
-        return undefined;
+        return {};
     try {
         const parsed = JSON.parse(metadata);
-        const provider = parsed.provider;
-        return typeof provider === 'string' && provider.length > 0 ? provider : undefined;
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? parsed
+            : {};
     }
     catch {
-        return undefined;
+        return {};
     }
 }
+function extractProvider(metadata) {
+    const provider = metadata.provider;
+    return typeof provider === 'string' && provider.length > 0 ? provider : undefined;
+}
 async function handleRestart(args) {
     const verbose = args.includes('--verbose');
     const taskId = args.find((a) => !a.startsWith('--'));
@@ -96,7 +101,10 @@ async function handleRestart(args) {
     // provider: recovered from metadata.provider (SDK-persisted). Falls back to
     // the agent's configured provider when absent. This preserves a
     // `crewx x --provider ...` choice across restart.
-    const provider = extractProvider(original.metadata);
+    const originalMetadata = parseTaskMetadata(original.metadata);
+    const provider = extractProvider(originalMetadata);
+    const originalWasOverdrive = originalMetadata.overdrive === true;
+    const originalOverdriveMode = originalMetadata.overdriveState === 'latch' ? 'latch' : 'count';
     (0, sdk_1.setAuditVerbose)(verbose);
     if (verbose) {
         process.stderr.write(`🔁 Restart: ${taskId} → ${newTaskId}\n`);
@@ -111,10 +119,16 @@ async function handleRestart(args) {
         threadId: original.thread_id ?? undefined,
         model,
         provider,
+        ...(originalWasOverdrive ? { overdrive: { mode: originalOverdriveMode } } : {}),
         metadata: {
             restartedFromTaskId: taskId,
             // Back-compat / search convenience: mirror the Web UI metadata key.
             retriedFromTaskId: taskId,
+            ...(originalWasOverdrive ? {
+                overdrive: true,
+                overdriveState: originalOverdriveMode,
+                overdriveMode: mode,
+            } : {}),
         },
         trace: (0, inherited_trace_1.readInheritedTrace)(),
     };

package/dist/commands/result.d.ts

@@ -3,8 +3,12 @@
  * 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=N   Poll (1s interval) up to N seconds for
+ *                                    the task to leave '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,13 +4,19 @@
  * 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=N   Poll (1s interval) up to N seconds for
+ *                                    the task to leave '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 POLL_INTERVAL_MS = 1000;
 function statusIcon(status) {
     switch (status) {
         case 'running': return '⏳';
@@ -19,8 +25,20 @@ function statusIcon(status) {
         default: return '❓';
     }
 }
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/** Parses `--wait=N` (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();
     if (!taskId) {
@@ -36,21 +54,38 @@ 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.');
         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 && task.status === 'running') {
+        const deadline = Date.now() + waitSeconds * 1000;
+        while (task && task.status === 'running') {
+            if (Date.now() >= deadline) {
+                console.error(`Task ${taskId} did not complete within --wait=${waitSeconds}s (status: running).`);
+                process.exit(124);
+                return;
+            }
+            await sleep(Math.min(POLL_INTERVAL_MS, Math.max(0, deadline - 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;

package/dist/commands/shortcut.d.ts

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