@crewx/cli 0.9.0-rc.9 → 0.9.0-rc.91

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,25 +25,123 @@
  */
 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");
+const emit_trailer_1 = require("./emit-trailer");
+/**
+ * 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.
  *
  * Default output: raw agent response only (stdout).
  * --verbose: debug info written to stderr, response to stdout.
  */
-async function handleExecute(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 handleExecute(args, command = 'execute', emitState = (0, emit_trailer_1.createDelegationEmitState)()) {
+    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.');
+            (0, emit_trailer_1.emitDelegationResult)({ command, isError: true, state: emitState });
+            process.exit(1);
+            return;
+        }
+        else {
+            runDetached(detachFilteredArgs);
+            return;
+        }
+    }
+    let parsedFlags;
+    try {
+        parsedFlags = (0, parse_common_flags_1.parseCommonFlags)(detachFilteredArgs);
+    }
+    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 execute [@agent] <task> [options]');
         console.error('       crewx x [@agent] <task> [options]');
@@ -55,6 +157,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,16 +165,26 @@ 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');
+        (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(`📋 Task: ${finalMessage}\n`);
@@ -80,6 +193,8 @@ 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)
@@ -95,22 +210,36 @@ async function handleExecute(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;
     }
+    // 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;
+    let result;
     try {
-        const result = await crewx.execute(agentRef, finalMessage, {
+        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 {
@@ -123,7 +252,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');
             }
@@ -132,11 +261,33 @@ 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 {
-        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/hook/command-marker.d.ts

@@ -0,0 +1,2 @@
+/** Match only commands that invoke CrewX's hook-dispatch subcommand. */
+export declare const CREWX_HOOK_COMMAND_RE: RegExp;

package/dist/commands/hook/command-marker.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CREWX_HOOK_COMMAND_RE = void 0;
+/** Match only commands that invoke CrewX's hook-dispatch subcommand. */
+exports.CREWX_HOOK_COMMAND_RE = /crewx(?:\.js|\.cmd|\.exe)?['"]?\s+hook-dispatch\b/i;

package/dist/commands/hook/install.d.ts

@@ -10,7 +10,6 @@
  *   - Never traverses parent directories — project root determined by crewx.yaml
  */
 import { type HookProvider } from './paths';
-export declare const CREWX_HOOK_COMMAND_MARKER = "crewx hook-dispatch";
 export declare function resolveCrewxBinary(): string;
 export interface HookInstallOpts {
     projectRoot: string;

package/dist/commands/hook/install.js

@@ -10,49 +10,14 @@
  *   - Preserves existing user hooks
  *   - Never traverses parent directories — project root determined by crewx.yaml
  */
-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.CREWX_HOOK_COMMAND_MARKER = void 0;
 exports.resolveCrewxBinary = resolveCrewxBinary;
 exports.handleHookInstall = handleHookInstall;
 const fs_1 = require("fs");
-const path_1 = require("path");
-const cp = __importStar(require("child_process"));
+const sdk_1 = require("@crewx/sdk");
 const paths_1 = require("./paths");
-exports.CREWX_HOOK_COMMAND_MARKER = 'crewx hook-dispatch';
-function getProviderConfigs(projectRoot, providers, crewxBin) {
+const command_marker_1 = require("./command-marker");
+function getProviderConfigs(projectRoot, providers) {
     return providers.map((provider) => ({
         settingsPath: provider === 'claude'
             ? (0, paths_1.getClaudeSettingsPath)(projectRoot)
@@ -63,24 +28,13 @@ function getProviderConfigs(projectRoot, providers, crewxBin) {
     }));
 }
 function resolveCrewxBinary() {
-    if (process.env.CREWX_CLI)
-        return process.env.CREWX_CLI;
-    try {
-        const which = cp.execSync('which crewx 2>/dev/null', { encoding: 'utf8' }).trim();
-        const isTmpProxy = which.includes('/T/crewx-proxy-') ||
-            which.includes('/tmp/crewx-proxy-') ||
-            /\/[Tt]e?mp\//.test(which);
-        if (which && !isTmpProxy)
-            return which;
+    const resolution = (0, sdk_1.resolveCrewxExecutable)();
+    if (!resolution.ok) {
+        throw new Error((0, sdk_1.formatCrewxExecutableFailure)(resolution));
     }
-    catch { }
-    if (process.argv[1]) {
-        const scriptPath = (0, path_1.resolve)(process.argv[1]);
-        if ((0, fs_1.existsSync)(scriptPath)) {
-            return `${process.execPath} ${scriptPath}`;
-        }
-    }
-    return 'crewx';
+    const stableEntrypoint = (0, sdk_1.materializeCrewxStableEntrypoint)(resolution);
+    const useStable = stableEntrypoint && resolution.argv.some(sdk_1.isRotatingInstallPath);
+    return (0, sdk_1.formatCrewxExecutableArgv)(useStable ? [stableEntrypoint] : resolution.argv);
 }
 function readSettingsTyped(settingsPath) {
     return (0, paths_1.readSettings)(settingsPath);
@@ -88,10 +42,19 @@ function readSettingsTyped(settingsPath) {
 function findCrewxEntry(preToolUse) {
     if (!preToolUse)
         return -1;
-    return preToolUse.findIndex((entry) => entry.hooks?.some((h) => h.command?.includes(exports.CREWX_HOOK_COMMAND_MARKER)));
+    return preToolUse.findIndex((entry) => entry.hooks?.some((h) => command_marker_1.CREWX_HOOK_COMMAND_RE.test(h.command)));
+}
+function findCrewxHook(entry) {
+    if (!entry.hooks)
+        return undefined;
+    const index = entry.hooks.findIndex((hook) => command_marker_1.CREWX_HOOK_COMMAND_RE.test(hook.command));
+    if (index < 0)
+        return undefined;
+    return { index, command: entry.hooks[index].command };
 }
 function installForProvider(projectRoot, config, crewxBin, yes) {
     const { settingsPath, provider, matcher, commandArg } = config;
+    const command = `${crewxBin} hook-dispatch ${commandArg}`;
     const settings = readSettingsTyped(settingsPath);
     if (!settings.hooks)
         settings.hooks = {};
@@ -99,8 +62,28 @@ function installForProvider(projectRoot, config, crewxBin, yes) {
         settings.hooks.PreToolUse = [];
     const existingIdx = findCrewxEntry(settings.hooks.PreToolUse);
     if (existingIdx >= 0) {
-        console.log(`[crewx] Hook already installed in ${settingsPath} (${provider})`);
-        return false;
+        const existingEntry = settings.hooks.PreToolUse[existingIdx];
+        const existingHook = findCrewxHook(existingEntry);
+        if (existingHook?.command === command) {
+            console.log(`[crewx] Hook already installed in ${settingsPath} (${provider})`);
+            return false;
+        }
+        if (!yes) {
+            console.log(`[crewx] Existing CrewX hook needs an install-path refresh in ${settingsPath} (${provider})`);
+            return false;
+        }
+        if ((0, fs_1.existsSync)(settingsPath)) {
+            const backupPath = settingsPath + '.crewx-backup';
+            (0, fs_1.copyFileSync)(settingsPath, backupPath);
+            console.log(`[crewx] Backup created: ${backupPath}`);
+        }
+        if (existingHook) {
+            existingEntry.hooks[existingHook.index] = { ...existingEntry.hooks[existingHook.index], command };
+        }
+        (0, fs_1.writeFileSync)(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf8');
+        console.log(`[crewx] Hook updated (${provider}): ${command}`);
+        console.log(`[crewx] Settings: ${settingsPath}`);
+        return true;
     }
     if (!yes) {
         console.log(`⚠️  crewx hook install will register crewx-hook-dispatch as a PreToolUse hook.\n` +
@@ -119,7 +102,6 @@ function installForProvider(projectRoot, config, crewxBin, yes) {
     else {
         (0, paths_1.ensureCodexHooks)(projectRoot);
     }
-    const command = `${crewxBin} hook-dispatch ${commandArg}`;
     settings.hooks.PreToolUse.push({
         matcher,
         hooks: [{ type: 'command', command }],
@@ -133,8 +115,15 @@ async function handleHookInstall(argsOrOpts) {
     if (!Array.isArray(argsOrOpts)) {
         const { projectRoot, yes, provider } = argsOrOpts;
         const providers = (0, paths_1.providersFromFilter)(provider ?? 'all');
-        const crewxBin = resolveCrewxBinary();
-        const configs = getProviderConfigs(projectRoot, providers, crewxBin);
+        let crewxBin;
+        try {
+            crewxBin = resolveCrewxBinary();
+        }
+        catch (error) {
+            console.error(`[crewx] ${error instanceof Error ? error.message : String(error)}`);
+            return;
+        }
+        const configs = getProviderConfigs(projectRoot, providers);
         for (const config of configs) {
             installForProvider(projectRoot, config, crewxBin, yes);
         }
@@ -152,8 +141,16 @@ async function handleHookInstall(argsOrOpts) {
     }
     const providerFilter = (0, paths_1.parseProviderArg)(args);
     const providers = (0, paths_1.providersFromFilter)(providerFilter);
-    const crewxBin = resolveCrewxBinary();
-    const configs = getProviderConfigs(projectRoot, providers, crewxBin);
+    let crewxBin;
+    try {
+        crewxBin = resolveCrewxBinary();
+    }
+    catch (error) {
+        console.error(`[crewx] ${error instanceof Error ? error.message : String(error)}`);
+        process.exitCode = 1;
+        return;
+    }
+    const configs = getProviderConfigs(projectRoot, providers);
     if (!yes) {
         const targets = configs.map((c) => `   - ${c.provider}: ${c.settingsPath}`).join('\n');
         console.log(`⚠️  crewx hook install will register crewx-hook-dispatch as a PreToolUse hook.\n` +

package/dist/commands/hook/status.js

@@ -11,7 +11,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const sdk_1 = require("@crewx/sdk");
 const paths_1 = require("./paths");
-const CREWX_HOOK_COMMAND_MARKER = 'crewx hook-dispatch';
+const command_marker_1 = require("./command-marker");
 function showProviderStatus(projectRoot, provider) {
     const settingsPath = provider === 'claude'
         ? (0, paths_1.getClaudeSettingsPath)(projectRoot)
@@ -26,9 +26,9 @@ function showProviderStatus(projectRoot, provider) {
     try {
         const settings = JSON.parse((0, fs_1.readFileSync)(settingsPath, 'utf8'));
         const preHooks = settings.hooks?.PreToolUse ?? [];
-        const crewxEntry = preHooks.find((entry) => entry.hooks?.some((h) => h.command?.includes(CREWX_HOOK_COMMAND_MARKER)));
+        const crewxEntry = preHooks.find((entry) => entry.hooks?.some((h) => command_marker_1.CREWX_HOOK_COMMAND_RE.test(h.command ?? '')));
         if (crewxEntry) {
-            const command = crewxEntry.hooks.find((h) => h.command?.includes(CREWX_HOOK_COMMAND_MARKER))?.command;
+            const command = crewxEntry.hooks.find((h) => command_marker_1.CREWX_HOOK_COMMAND_RE.test(h.command ?? ''))?.command;
             console.log(`    Status:   INSTALLED`);
             console.log(`    Command:  ${command}`);
         }

package/dist/commands/hook/uninstall.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleHookUninstall = handleHookUninstall;
 const fs_1 = require("fs");
 const paths_1 = require("./paths");
-const CREWX_HOOK_COMMAND_MARKER = 'crewx hook-dispatch';
+const command_marker_1 = require("./command-marker");
 function getSettingsPath(projectRoot, provider) {
     return provider === 'claude'
         ? (0, paths_1.getClaudeSettingsPath)(projectRoot)
@@ -35,7 +35,7 @@ function uninstallFromProvider(projectRoot, provider) {
         return;
     }
     const before = settings.hooks.PreToolUse.length;
-    settings.hooks.PreToolUse = settings.hooks.PreToolUse.filter((entry) => !entry.hooks?.some((h) => h.command?.includes(CREWX_HOOK_COMMAND_MARKER)));
+    settings.hooks.PreToolUse = settings.hooks.PreToolUse.filter((entry) => !entry.hooks?.some((h) => command_marker_1.CREWX_HOOK_COMMAND_RE.test(h.command)));
     const removed = settings.hooks.PreToolUse.length < before;
     if (settings.hooks.PreToolUse.length === 0) {
         delete settings.hooks.PreToolUse;

package/dist/commands/init.js

@@ -52,6 +52,7 @@ const git = __importStar(require("isomorphic-git"));
 const nodeFs = __importStar(require("fs"));
 const os_1 = __importDefault(require("os"));
 const repository_1 = require("@crewx/sdk/repository");
+const sdk_1 = require("@crewx/sdk");
 const install_1 = require("./hook/install");
 const STATUSLINE_SCRIPT_NAME = 'claude-usage-statusline.js';
 const STATUSLINE_SCRIPT_MARKER = 'CrewX claude-usage-statusline';
@@ -84,6 +85,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
@@ -435,7 +441,7 @@ async function handleInit(opts) {
         }
     }
     // Always create docs dirs and templates, regardless of whether yaml was skipped
-    for (const dir of ['.crewx/logs', '.claude/commands', 'docs/goal', 'docs/daily', 'docs/wi']) {
+    for (const dir of ['.crewx/logs', '.claude/commands', 'docs/goal', 'docs/daily', 'docs/wi', 'workflows']) {
         try {
             (0, fs_1.mkdirSync)((0, path_1.join)(target, dir), { recursive: true });
         }
@@ -456,6 +462,21 @@ async function handleInit(opts) {
             console.log(`✅ ${t.dir}/ ${action} (${t.file})`);
         }
     }
+    try {
+        const workflowTemplatesDir = (0, sdk_1.resolveWorkflowTemplatesPath)();
+        for (const filename of [sdk_1.WI_DEFAULT_FLOW_FILENAME, sdk_1.WI_PLAN_FLOW_FILENAME]) {
+            const sourcePath = (0, path_1.join)(workflowTemplatesDir, filename);
+            const targetPath = (0, path_1.join)(target, 'workflows', filename);
+            if (force || !(0, fs_1.existsSync)(targetPath)) {
+                const action = (0, fs_1.existsSync)(targetPath) ? 'updated' : 'created';
+                (0, fs_1.copyFileSync)(sourcePath, targetPath);
+                console.log(`✅ workflows/ ${action} (${filename})`);
+            }
+        }
+    }
+    catch (e) {
+        errors.push(`WORKFLOW_TEMPLATE_FAILED:${e.message}`);
+    }
     // Always register workspace in ~/.crewx/crewx.db (best-effort, idempotent)
     let workspaceId;
     let slug;

package/dist/commands/log.js

@@ -10,6 +10,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleLog = handleLog;
+const sdk_1 = require("@crewx/sdk");
 const repository_1 = require("@crewx/sdk/repository");
 function statusIcon(status) {
     switch (status) {
@@ -36,10 +37,10 @@ async function handleLog(args) {
         console.log(`Status: ${statusIcon(task.status)} ${task.status}`);
         console.log(`Agent: ${task.agent_id ?? '—'}`);
         console.log(`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) {
             const duration = new Date(task.completed_at).getTime() - new Date(task.started_at).getTime();
-            console.log(`Completed: ${new Date(task.completed_at).toLocaleString()} (${duration}ms)`);
+            console.log(`Completed: ${(0, sdk_1.formatDisplayTimestamp)(new Date(task.completed_at))} (${duration}ms)`);
         }
         console.log('='.repeat(60));
         console.log('');
@@ -78,7 +79,7 @@ async function handleLog(args) {
                 : 'running...';
             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))}`);
             console.log(`   Duration: ${duration}`);
             console.log('');
         });

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

@@ -2,7 +2,7 @@
  * Common flag parser for query/execute commands.
  *
  * Supports both `--flag=value` and `--flag value` forms.
- * Handles: --thread, --provider, --metadata, --verbose, --config/-c,
+ * 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
@@ -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. */
@@ -28,6 +30,8 @@ export interface CommonFlags {
     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,7 +3,7 @@
  * Common flag parser for query/execute commands.
  *
  * Supports both `--flag=value` and `--flag value` forms.
- * Handles: --thread, --provider, --metadata, --verbose, --config/-c,
+ * 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
@@ -63,11 +63,13 @@ 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
@@ -75,11 +77,13 @@ function parseCommonFlags(args) {
     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 = {};
@@ -153,7 +157,7 @@ function parseCommonFlags(args) {
         }
         rest.push(token);
     }
-    return { thread, provider, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, rest };
+    return { thread, provider, model, metadata, verbose, config, outputFormat, effort, promptFile, overdrive, vars, out, rest };
 }
 /**
  * Parse metadata JSON string from --metadata flag.