@crewx/cli 0.9.0-rc.4 → 0.9.0-rc.40

package/dist/bootstrap/codex-writable-roots.d.ts

@@ -0,0 +1,45 @@
+/**
+ * CLI-layer policy: inject CrewX home as an extra writable root for Codex
+ * `workspace-write` sandbox invocations.
+ *
+ * Why this lives in packages/cli (not packages/sdk):
+ * CrewX home (`~/.crewx` by default) is a product-specific path. The SDK's
+ * `additionalArgsProvider` extension point (WI-20260703-001) exists precisely
+ * so that product layers like this CLI can inject such paths without the SDK
+ * knowing about them.
+ *
+ * Why `-c sandbox_workspace_write.writable_roots=[...]` instead of `--add-dir`:
+ * Verified against codex-cli 0.139.0 (`codex exec --help` / `codex exec resume --help`):
+ *   - `codex exec` supports `--add-dir <DIR>`.
+ *   - `codex exec resume` does NOT support `--add-dir` (only `-c/--config`).
+ * Using the `-c` config-override form works identically for both `exec` and
+ * `exec resume`, avoiding a resume-incompatible flag.
+ */
+import type { AdditionalArgsProvider } from '@crewx/sdk';
+/**
+ * Resolve CrewX home directory.
+ * Priority: `CREWX_HOME` env var → `~/.crewx`.
+ */
+export declare function resolveCrewxHome(): string;
+/**
+ * Escape a string for embedding inside a TOML basic string (`"..."`).
+ * Sufficient for filesystem paths: handles backslash (Windows paths),
+ * double-quote, and control characters that could otherwise break TOML
+ * parsing of the `-c key="value"` override.
+ */
+export declare function escapeTomlBasicString(value: string): string;
+/**
+ * Build the `-c sandbox_workspace_write.writable_roots=["<path>"]` arg pair.
+ * Works for both `codex exec` and `codex exec resume` (config-override form).
+ */
+export declare function buildCodexWritableRootArgs(crewxHome: string): string[];
+/**
+ * Create an `AdditionalArgsProvider` (SDK extension point, WI-20260703-001)
+ * that injects CrewX home as a Codex writable root for `workspace-write`
+ * equivalent modes (`agent`, `auto`, `undefined`).
+ *
+ * No-ops for:
+ *   - Non-codex providers.
+ *   - Modes in {@link NO_INJECT_MODES} (read-only/plan/agent-full-access/yolo/danger-full-access).
+ */
+export declare function createCodexWritableRootsProvider(crewxHome?: string): AdditionalArgsProvider;

package/dist/bootstrap/codex-writable-roots.js

@@ -0,0 +1,88 @@
+"use strict";
+/**
+ * CLI-layer policy: inject CrewX home as an extra writable root for Codex
+ * `workspace-write` sandbox invocations.
+ *
+ * Why this lives in packages/cli (not packages/sdk):
+ * CrewX home (`~/.crewx` by default) is a product-specific path. The SDK's
+ * `additionalArgsProvider` extension point (WI-20260703-001) exists precisely
+ * so that product layers like this CLI can inject such paths without the SDK
+ * knowing about them.
+ *
+ * Why `-c sandbox_workspace_write.writable_roots=[...]` instead of `--add-dir`:
+ * Verified against codex-cli 0.139.0 (`codex exec --help` / `codex exec resume --help`):
+ *   - `codex exec` supports `--add-dir <DIR>`.
+ *   - `codex exec resume` does NOT support `--add-dir` (only `-c/--config`).
+ * Using the `-c` config-override form works identically for both `exec` and
+ * `exec resume`, avoiding a resume-incompatible flag.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveCrewxHome = resolveCrewxHome;
+exports.escapeTomlBasicString = escapeTomlBasicString;
+exports.buildCodexWritableRootArgs = buildCodexWritableRootArgs;
+exports.createCodexWritableRootsProvider = createCodexWritableRootsProvider;
+const os_1 = require("os");
+const path_1 = require("path");
+/**
+ * crewx.yaml / query-option `mode` values for which Codex is NOT running in
+ * (or being pushed into) a `workspace-write`-equivalent sandbox. Injecting an
+ * extra writable root is meaningless (read-only/plan) or redundant
+ * (full-access variants already allow writes everywhere) in these modes.
+ */
+const NO_INJECT_MODES = new Set([
+    'read-only',
+    'plan',
+    'agent-full-access',
+    'yolo',
+    'danger-full-access',
+]);
+/**
+ * Resolve CrewX home directory.
+ * Priority: `CREWX_HOME` env var → `~/.crewx`.
+ */
+function resolveCrewxHome() {
+    return process.env.CREWX_HOME ?? (0, path_1.join)((0, os_1.homedir)(), '.crewx');
+}
+/**
+ * Escape a string for embedding inside a TOML basic string (`"..."`).
+ * Sufficient for filesystem paths: handles backslash (Windows paths),
+ * double-quote, and control characters that could otherwise break TOML
+ * parsing of the `-c key="value"` override.
+ */
+function escapeTomlBasicString(value) {
+    return value
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\n/g, '\\n')
+        .replace(/\r/g, '\\r')
+        .replace(/\t/g, '\\t');
+}
+/**
+ * Build the `-c sandbox_workspace_write.writable_roots=["<path>"]` arg pair.
+ * Works for both `codex exec` and `codex exec resume` (config-override form).
+ */
+function buildCodexWritableRootArgs(crewxHome) {
+    const escaped = escapeTomlBasicString(crewxHome);
+    return ['-c', `sandbox_workspace_write.writable_roots=["${escaped}"]`];
+}
+function isCodexProvider(ctx) {
+    return ctx.providerId === 'codex' || ctx.providerStr === 'cli/codex';
+}
+/**
+ * Create an `AdditionalArgsProvider` (SDK extension point, WI-20260703-001)
+ * that injects CrewX home as a Codex writable root for `workspace-write`
+ * equivalent modes (`agent`, `auto`, `undefined`).
+ *
+ * No-ops for:
+ *   - Non-codex providers.
+ *   - Modes in {@link NO_INJECT_MODES} (read-only/plan/agent-full-access/yolo/danger-full-access).
+ */
+function createCodexWritableRootsProvider(crewxHome = resolveCrewxHome()) {
+    return (ctx) => {
+        if (!isCodexProvider(ctx))
+            return [];
+        if (ctx.mode !== undefined && NO_INJECT_MODES.has(ctx.mode))
+            return [];
+        return buildCodexWritableRootArgs(crewxHome);
+    };
+}

package/dist/bootstrap/crewx-cli.js

@@ -9,6 +9,7 @@ const plugins_1 = require("@crewx/sdk/plugins");
 const repository_1 = require("@crewx/sdk/repository");
 const register_builtin_tools_1 = require("../register-builtin-tools");
 const version_1 = require("../utils/version");
+const codex_writable_roots_1 = require("./codex-writable-roots");
 /**
  * Build a Crewx instance with CLI-standard plugins (FileLogger + SqliteTracing)
  * and built-in tools registered. Use this from any CLI command that needs a
@@ -52,6 +53,7 @@ async function createCliCrewx(configPath = process.env.CREWX_CONFIG ?? 'crewx.ya
     }
     const crewx = await sdk_1.Crewx.loadYaml(yamlPath, {
         remoteFactory: createCliCrewx,
+        additionalArgsProvider: (0, codex_writable_roots_1.createCodexWritableRootsProvider)(),
     });
     (0, register_builtin_tools_1.registerBuiltinToolsIfNeeded)(crewx);
     await crewx.use(new plugins_1.ConversationPlugin());

package/dist/builtin.js

@@ -55,6 +55,7 @@ const BUILTIN_MAP = {
     dreaming: () => Promise.resolve().then(() => __importStar(require('@crewx/dreaming/cli'))),
     wi: () => Promise.resolve().then(() => __importStar(require('@crewx/wi/cli'))),
     chromex: () => Promise.resolve().then(() => __importStar(require('@crewx/chromex/cli'))),
+    notify: () => Promise.resolve().then(() => __importStar(require('@crewx/notify/cli'))),
 };
 exports.BUILTIN_COMMANDS = new Set(Object.keys(BUILTIN_MAP));
 // Load skill-tracer for observability (graceful degradation if unavailable)

package/dist/commands/execute.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)
@@ -12,6 +13,9 @@
  *   --output-format <fmt>    Output format (json|text|stream-json)
  *   --effort <level>         Model effort (high|medium|low)
  *   -f/--prompt-file <path>  Read task body from file (bypasses cmd.exe argv truncation)
+ *   --detach                 Re-spawn as a detached runner; print task-id and exit 0 immediately.
+ *                           Ignored when CREWX_TRACE_ID is already set (recursive-spawn guard) or
+ *                           on win32 (unsupported — exits with an error).
  *
  * Stdin support:
  *   Pipe or redirect content into crewx x to supply the task body via stdin.

package/dist/commands/execute.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,9 @@
  *   --output-format <fmt>    Output format (json|text|stream-json)
  *   --effort <level>         Model effort (high|medium|low)
  *   -f/--prompt-file <path>  Read task body from file (bypasses cmd.exe argv truncation)
+ *   --detach                 Re-spawn as a detached runner; print task-id and exit 0 immediately.
+ *                           Ignored when CREWX_TRACE_ID is already set (recursive-spawn guard) or
+ *                           on win32 (unsupported — exits with an error).
  *
  * Stdin support:
  *   Pipe or redirect content into crewx x to supply the task body via stdin.
@@ -21,12 +25,72 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleExecute = handleExecute;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const os_1 = require("os");
 const sdk_1 = require("@crewx/sdk");
 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");
+/**
+ * Split `--detach` out of argv, respecting the `--` literal-args sentinel
+ * (a `--detach` appearing after `--` is message text, not the flag).
+ */
+function extractDetachFlag(args) {
+    const rest = [];
+    let detach = false;
+    let escapeMode = false;
+    for (const arg of args) {
+        if (!escapeMode && arg === '--') {
+            escapeMode = true;
+            rest.push(arg);
+            continue;
+        }
+        if (!escapeMode && arg === '--detach') {
+            detach = true;
+            continue;
+        }
+        rest.push(arg);
+    }
+    return { detach, rest };
+}
+/**
+ * Double-detach: re-spawn this same CLI entry (minus --detach) as a detached
+ * process so it survives the parent's exit. The task-id is pre-generated here
+ * and injected as CREWX_TRACE_ID so the runner's own task row is created under
+ * this id (see handleExecute's `selfTaskId` derivation below) — it doubles as
+ * both this task's row id and the root of any further delegation it spawns.
+ *
+ * stdout contract (script-parseable): task-id only, on the first line.
+ * Everything else goes to stderr.
+ */
+function runDetached(filteredArgs) {
+    const taskId = (0, sdk_1.generateId)('tsk');
+    const logDir = (0, path_1.join)((0, os_1.homedir)(), '.crewx', 'logs');
+    if (!(0, fs_1.existsSync)(logDir))
+        (0, fs_1.mkdirSync)(logDir, { recursive: true });
+    const logPath = (0, path_1.join)(logDir, `${taskId}.log`);
+    const logFd = (0, fs_1.openSync)(logPath, 'a');
+    const entry = process.argv[1];
+    const child = (0, child_process_1.spawn)(process.execPath, [entry, 'x', ...filteredArgs], {
+        detached: true,
+        stdio: ['ignore', logFd, logFd],
+        env: { ...process.env, CREWX_TRACE_ID: taskId },
+    });
+    (0, fs_1.closeSync)(logFd);
+    child.on('error', (err) => {
+        process.stderr.write(`Failed to spawn detached runner: ${err.message}\n`);
+    });
+    child.unref();
+    console.log(taskId);
+    process.stderr.write(`Detached task ${taskId} started (log: ${logPath}).\n`);
+    process.stderr.write(`Use \`crewx result ${taskId} --wait=N\` to wait for completion.\n`);
+    process.exit(0);
+}
 /**
  * Handle `crewx execute <agentRef> <message>` command.
  *
@@ -34,7 +98,26 @@ const inherited_trace_1 = require("../utils/inherited-trace");
  * --verbose: debug info written to stderr, response to stdout.
  */
 async function handleExecute(args) {
-    const { thread, provider, metadata, verbose, config, outputFormat, effort, promptFile, vars, rest } = (0, parse_common_flags_1.parseCommonFlags)(args);
+    const { detach, rest: detachFilteredArgs } = extractDetachFlag(args);
+    if (detach) {
+        // Recursive-spawn guard: a CREWX_TRACE_ID already present means this
+        // process is itself running inside a traced context (either the
+        // respawned runner, or a delegated sub-call) — never chain a second
+        // detach off of it. Silently fall through to normal (synchronous) execution.
+        if (process.env['CREWX_TRACE_ID']) {
+            process.stderr.write('Note: --detach ignored (already running inside a traced context; CREWX_TRACE_ID is set).\n');
+        }
+        else if (process.platform === 'win32') {
+            console.error('Error: --detach is not supported on win32.');
+            process.exit(1);
+            return;
+        }
+        else {
+            runDetached(detachFilteredArgs);
+            return;
+        }
+    }
+    const { thread, provider, model, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, out, rest } = (0, parse_common_flags_1.parseCommonFlags)(detachFilteredArgs);
     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 +138,7 @@ async function handleExecute(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 +146,11 @@ async function handleExecute(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 task 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 +165,14 @@ async function handleExecute(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 = {};
@@ -94,19 +184,32 @@ async function handleExecute(args) {
         process.stderr.write(`Error: ${msg}\n`);
         process.exit(2);
     }
+    const inheritedTrace = (0, inherited_trace_1.readInheritedTrace)();
+    // A trace with a rootTraceId but no parentTaskId means the id was pre-assigned
+    // to *this* task itself (the detach runner's parent injects only CREWX_TRACE_ID,
+    // never CREWX_PARENT_TASK_ID — see execute.ts's runDetached), not inherited from
+    // an ancestor task in a delegation chain (which always carries both). It doubles
+    // as this task's own row id so `crewx result <task-id>` can find it.
+    const selfTaskId = inheritedTrace && !inheritedTrace.parentTaskId
+        ? (inheritedTrace.rootTraceId || undefined)
+        : undefined;
     let exitCode = 0;
     try {
         const result = await crewx.execute(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 ?? 'Execute failed';
             console.error(errMsg);
+            (0, write_output_1.appendError)(out, errMsg);
             exitCode = 1;
         }
         else {
@@ -119,7 +222,7 @@ async function handleExecute(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✅ Execute completed successfully\n');
             }
@@ -128,6 +231,7 @@ async function handleExecute(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/init.js

@@ -84,6 +84,11 @@ const CREWX_MARKER = '# CrewX runtime';
 const CREWX_GITIGNORE = `# CrewX runtime
 .crewx/
 
+# Secrets (workspace .env — see docs/manual)
+.env
+.env.*
+!.env.example
+
 # Memory runtime state (regenerable from entries/)
 memory/*/.dirty-summary
 memory/*/graph.json

package/dist/commands/parse-common-flags.d.ts

@@ -2,8 +2,8 @@
  * Common flag parser for query/execute commands.
  *
  * Supports both `--flag=value` and `--flag value` forms.
- * Handles: --thread, --provider, --metadata, --verbose, --config/-c,
- *          --output-format, --effort, --prompt-file/-f.
+ * Handles: --thread, --provider, --model, --metadata, --verbose, --config/-c,
+ *          --output-format, --effort, --prompt-file/-f, --overdrive.
  *
  * Strict mode: unknown --xxx tokens after known flags are consumed throw an
  * error instead of silently leaking into the message prompt.
@@ -14,6 +14,8 @@ export interface CommonFlags {
     thread?: string;
     /** Provider override (e.g., cli/claude). */
     provider?: string;
+    /** Model override (e.g., claude-sonnet-5). */
+    model?: string;
     /** Raw metadata JSON string. */
     metadata?: string;
     /** Enable verbose/debug output mode. */
@@ -26,6 +28,10 @@ export interface CommonFlags {
     effort?: string;
     /** Path to a file whose content is used as the prompt body (-f/--prompt-file). */
     promptFile?: string;
+    /** Whether overdrive (boost) is active for this request. */
+    overdrive: boolean;
+    /** Output file path for saving result (--out/-o). */
+    out?: string;
     /** Template variables from --var key=value flags. */
     vars: Record<string, string>;
     /** Remaining non-flag positional arguments. */

package/dist/commands/parse-common-flags.js

@@ -3,8 +3,8 @@
  * Common flag parser for query/execute commands.
  *
  * Supports both `--flag=value` and `--flag value` forms.
- * Handles: --thread, --provider, --metadata, --verbose, --config/-c,
- *          --output-format, --effort, --prompt-file/-f.
+ * Handles: --thread, --provider, --model, --metadata, --verbose, --config/-c,
+ *          --output-format, --effort, --prompt-file/-f, --overdrive.
  *
  * Strict mode: unknown --xxx tokens after known flags are consumed throw an
  * error instead of silently leaking into the message prompt.
@@ -63,22 +63,27 @@ exports.UnknownOptionError = UnknownOptionError;
 function parseCommonFlags(args) {
     const thread = parseFlag(args, '--thread');
     const provider = parseFlag(args, '--provider');
+    const model = parseFlag(args, '--model');
     const metadata = parseFlag(args, '--metadata');
     const config = parseFlag(args, '--config', '-c');
     const outputFormat = parseFlag(args, '--output-format');
     const effort = parseFlag(args, '--effort');
     const promptFile = parseFlag(args, '--prompt-file', '-f');
+    const out = parseFlag(args, '--out', '-o');
     const verbose = hasFlag(args, '--verbose');
+    const overdrive = hasFlag(args, '--overdrive');
     // Collect consumed positions for known flags
     const consumed = new Set();
     const flagPairs = [
         { names: ['--thread'] },
         { names: ['--provider'] },
+        { names: ['--model'] },
         { names: ['--metadata'] },
         { names: ['--config', '-c'] },
         { names: ['--output-format'] },
         { names: ['--effort'] },
         { names: ['--prompt-file', '-f'] },
+        { names: ['--out', '-o'] },
     ];
     // Parse --var key=value flags (multiple allowed; last value wins on duplicate keys)
     const vars = {};
@@ -88,6 +93,10 @@ function parseCommonFlags(args) {
             consumed.add(i);
             continue;
         }
+        if (arg === '--overdrive') {
+            consumed.add(i);
+            continue;
+        }
         // --var=key=value or --var key=value
         if (arg.startsWith('--var=') || arg === '--var') {
             let kv;
@@ -148,7 +157,7 @@ function parseCommonFlags(args) {
         }
         rest.push(token);
     }
-    return { thread, provider, metadata, verbose, config, outputFormat, effort, promptFile, vars, rest };
+    return { thread, provider, model, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, out, rest };
 }
 /**
  * Parse metadata JSON string from --metadata flag.

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/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

@@ -23,7 +23,7 @@ exports.KNOWN_COMMANDS = new Set([
 /** 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,18 @@
  * 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 repository_1 = require("@crewx/sdk/repository");
+const POLL_INTERVAL_MS = 1000;
 function statusIcon(status) {
     switch (status) {
         case 'running': return '⏳';
@@ -19,8 +24,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) {
@@ -45,12 +62,29 @@ async function handleResult(args) {
         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/write-output.d.ts

@@ -0,0 +1,3 @@
+export declare function writeResult(out: string | undefined, data: string): void;
+/** On failure: if out is specified, append to file (avoid empty file). stderr is kept by the caller. */
+export declare function appendError(out: string | undefined, message: string): void;

package/dist/commands/write-output.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeResult = writeResult;
+exports.appendError = appendError;
+/**
+ * EPIPE-safe result output.
+ * - out specified: write success result to file (sync, no stream EPIPE)
+ * - out not specified: fall back to existing stdout (console.log)
+ */
+const fs_1 = require("fs");
+function writeResult(out, data) {
+    if (out) {
+        (0, fs_1.writeFileSync)(out, data, 'utf8');
+    }
+    else {
+        console.log(data);
+    }
+}
+/** On failure: if out is specified, append to file (avoid empty file). stderr is kept by the caller. */
+function appendError(out, message) {
+    if (out) {
+        (0, fs_1.appendFileSync)(out, message.endsWith('\n') ? message : message + '\n', 'utf8');
+    }
+}

package/dist/main.d.ts

@@ -5,7 +5,8 @@
  *
  * Boot sequence:
  *   1. Inject CREWX_CLI / CREWX_WORKSPACE env defaults (must be first)
- *   2. Parse command
- *   3. Dispatch to handler
+ *   2. Load workspace .env (does not override existing process.env values)
+ *   3. Parse command
+ *   4. Dispatch to handler
  */
 export {};

package/dist/main.js

@@ -6,8 +6,9 @@
  *
  * Boot sequence:
  *   1. Inject CREWX_CLI / CREWX_WORKSPACE env defaults (must be first)
- *   2. Parse command
- *   3. Dispatch to handler
+ *   2. Load workspace .env (does not override existing process.env values)
+ *   3. Parse command
+ *   4. Dispatch to handler
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -46,8 +47,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // ─── P0-1: Env Bootstrap ─────────────────────────────────────────────────────
 // Must run before any other code that might use process.env.CREWX_CLI.
 const env_defaults_1 = require("./utils/env-defaults");
+const sdk_1 = require("@crewx/sdk");
+const dotenv = __importStar(require("dotenv"));
+const path_1 = require("path");
 process.env.CREWX_CLI ??= (0, env_defaults_1.resolveCrewxCli)();
 process.env.CREWX_WORKSPACE ??= (0, env_defaults_1.resolveCrewxWorkspace)();
+// Load the workspace .env (WI-20260725-010): keeps CLI (crewx q/x) in parity with
+// the server's ConfigModule, which already reads cwd/.env. override:false so a
+// value already present in the shell/environment always wins over the file.
+// quiet:true suppresses dotenv's injected-keys log and tip banner on stdout.
+dotenv.config({ path: (0, path_1.join)(process.env.CREWX_WORKSPACE, '.env'), override: false, quiet: true });
+// ─── Pricing remote override (WI-20260701-002) ───────────────────────────────
+// Best-effort, non-blocking: fetch remote model registry so new models get
+// accurate pricing without a CLI republish. Falls back to bundled table on
+// failure / offline. Browser entry does not call this automatically.
+void (0, sdk_1.initPricingRemote)();
 // ─── Command Imports ──────────────────────────────────────────────────────────
 const query_1 = require("./commands/query");
 const execute_1 = require("./commands/execute");
@@ -256,12 +270,19 @@ Query / Execute:
     --verbose                    Debug output mode (default: raw response only)
     --config/-c <path>           Config file path (default: CREWX_CONFIG or crewx.yaml)
     --output-format <fmt>        Output format (json|text|stream-json)
+    --out/-o <path>              Save result to file (stdout suppressed)
     --effort <level>             Model effort (high|medium|low)
     -f/--prompt-file <path>      Read task body from file (bypasses argv length limits)
     --var key=value              Template variable (repeatable). Accessible as {{key}} in agent prompt.
     --                           End of flags; remaining tokens treated as message text
                                  e.g. crewx q "@agent label" -- --flag-in-message
 
+  x/execute only:
+    --detach                     Re-spawn as a detached background runner; print task-id
+                                 and exit 0 immediately. Ignored if CREWX_TRACE_ID is
+                                 already set (recursive-spawn guard). Unsupported on win32.
+                                 e.g. crewx x "@agent label" --detach
+
 Agent Management:
   agent ls [options]             List configured agents
     --role <value>               Filter by role (comma-separated for OR match)
@@ -274,6 +295,8 @@ Task Management:
   kill <task-id>                 Kill a running task
   kill --all                     Kill all running tasks
   result [task-id]               Get task result (or list recent tasks)
+    --wait=N                     Poll (1s interval) up to N seconds for the task to
+                                 finish. Exit 124 on timeout. --wait=0 = single check.
   restart <task-id>              Restart a failed task as a new task
 
 Logs & Diagnostics:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewx/cli",
-  "version": "0.9.0-rc.4",
+  "version": "0.9.0-rc.40",
   "license": "UNLICENSED",
   "engines": {
     "node": ">=20.19.0"
@@ -23,17 +23,19 @@
   "dependencies": {
     "@crewx/adapter-slack": "0.1.4",
     "better-sqlite3": "*",
+    "dotenv": "17.2.3",
     "isomorphic-git": "1.37.1",
-    "@crewx/memory": "0.1.23",
-    "@crewx/sdk": "0.9.0-rc.4",
-    "@crewx/search": "0.1.10",
-    "@crewx/cron": "0.1.10",
-    "@crewx/workflow": "0.3.22",
+    "@crewx/sdk": "0.9.0-rc.40",
+    "@crewx/memory": "0.1.23-rc.56",
+    "@crewx/search": "0.1.10-rc.35",
     "@crewx/doc": "0.1.9",
+    "@crewx/wbs": "0.1.10-rc.65",
+    "@crewx/cron": "0.1.10-rc.74",
+    "@crewx/workflow": "0.3.22-rc.86",
     "@crewx/skill": "0.1.20",
-    "@crewx/wbs": "0.1.10",
-    "@crewx/chromex": "0.1.0",
-    "@crewx/wi": "0.1.10",
+    "@crewx/wi": "0.1.10-rc.60",
+    "@crewx/chromex": "0.1.0-rc.72",
+    "@crewx/notify": "0.1.0-rc.10",
     "@crewx/shared": "0.0.6"
   },
   "devDependencies": {