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

package/dist/commands/shortcut.js

@@ -0,0 +1,267 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleShortcut = handleShortcut;
+/**
+ * crewx shortcut handler — thin CLI wrapper over @crewx/sdk/desktop.
+ *
+ * Usage:
+ *   crewx shortcut status [--json]
+ *   crewx shortcut install [--force] [--json]
+ *   crewx shortcut uninstall [--json]
+ *
+ * All win32/foreign/superseded/force judgment lives in @crewx/sdk/desktop.
+ * This module only parses argv, forwards options, and renders the result.
+ */
+const desktop_1 = require("@crewx/sdk/desktop");
+const parse_common_flags_1 = require("./parse-common-flags");
+const NOT_WINDOWS_MESSAGE = 'NOT_WINDOWS: Desktop shortcuts are only supported on Windows.';
+function parseShortcutFlags(args, allowForce) {
+    let json = false;
+    let force = false;
+    for (const arg of args) {
+        if (arg === '--json') {
+            json = true;
+            continue;
+        }
+        if (arg === '--force' && allowForce) {
+            force = true;
+            continue;
+        }
+        throw new parse_common_flags_1.UnknownOptionError(`Unknown option: ${arg}`);
+    }
+    return { json, force };
+}
+/** Forwarded verbatim to stderr as each SDK phase starts — never buffered. */
+function onProgress(event) {
+    process.stderr.write(`[shortcut] ${event.message}\n`);
+}
+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);
+}
+/** The SDK returns `supported:false` (no throw) for install/uninstall on non-Windows. */
+function failNotWindows(json) {
+    if (json) {
+        printJson({ success: false, supported: false, state: 'unsupported', error: NOT_WINDOWS_MESSAGE });
+    }
+    else {
+        console.error(`✗ ${NOT_WINDOWS_MESSAGE}`);
+    }
+    process.exit(1);
+}
+/**
+ * Detects the two ways a resolved (non-thrown) install result must NOT be
+ * read as success: a `superseded` shortcut (checked via both `state` and the
+ * `errors[]` entry, since either alone could otherwise be missed) and an
+ * unconfirmed global install (`installedGlobal:false` with
+ * `GLOBAL_INSTALL_UNCONFIRMED` in errors — npm exited 0 but re-detection
+ * could not confirm it).
+ */
+function installFailureReason(result) {
+    const supersededError = result.errors.find((e) => e.startsWith('SUPERSEDED:'));
+    if (result.state === 'superseded' || supersededError) {
+        return supersededError ?? 'Installed shortcut belongs to a newer CrewX version; refusing to modify it.';
+    }
+    const unconfirmedError = result.errors.find((e) => e.startsWith('GLOBAL_INSTALL_UNCONFIRMED:'));
+    if (!result.installedGlobal && unconfirmedError) {
+        return unconfirmedError;
+    }
+    if (result.errors.length > 0) {
+        return result.errors[0];
+    }
+    return null;
+}
+/**
+ * Only these two re-detected states mean the Desktop truly has no CrewX
+ * shortcut left. Everything else — `foreign`/`superseded` (SDK refused to
+ * touch it) and `installed`/`stale` (the `.lnk` unlink threw and was
+ * swallowed as "already gone" — install.ts `uninstallShortcut`) — means the
+ * file is still on disk. A success ALLOWLIST is used instead of enumerating
+ * failure states so an unlink failure (EPERM/EBUSY/locked/AV hook) that
+ * re-detects back to `installed` fails closed by construction, rather than
+ * requiring every new failure path to be added to an exclusion list.
+ */
+const UNINSTALL_SUCCESS_STATES = new Set(['declined', 'not-installed']);
+function uninstallFailureReason(result) {
+    if (UNINSTALL_SUCCESS_STATES.has(result.state)) {
+        return null;
+    }
+    const supersededError = result.errors.find((e) => e.startsWith('SUPERSEDED:'));
+    if (result.state === 'superseded' || supersededError) {
+        return supersededError ?? 'Installed shortcut belongs to a newer CrewX version; nothing was removed.';
+    }
+    if (result.state === 'foreign') {
+        const nsisError = result.errors.find((e) => e.startsWith('NSIS_PRESENT:'));
+        return nsisError ?? 'Existing Desktop shortcut is not managed by CrewX; nothing was removed.';
+    }
+    if (result.errors.length > 0) {
+        return result.errors[0];
+    }
+    return `CrewX desktop shortcut could not be removed (state: ${result.state}).`;
+}
+function printStatusHuman(status) {
+    switch (status.state) {
+        case 'unsupported':
+            console.log('Desktop shortcuts are only supported on Windows.');
+            break;
+        case 'not-installed':
+            console.log('No CrewX desktop shortcut installed yet.');
+            console.log('Run `crewx shortcut install` to create one.');
+            break;
+        case 'declined':
+            console.log('CrewX desktop shortcut setup was previously dismissed.');
+            console.log('Run `crewx shortcut install` to create one.');
+            break;
+        case 'installed':
+            console.log('✓ CrewX desktop shortcut is installed and up to date.');
+            if (status.shortcutPath)
+                console.log(`  Shortcut: ${status.shortcutPath}`);
+            break;
+        case 'stale':
+            console.log('⚠ CrewX desktop shortcut needs an update.');
+            console.log('Run `crewx shortcut install` to refresh it.');
+            break;
+        case 'foreign':
+            console.log('⚠ A Desktop shortcut exists that CrewX does not manage.');
+            console.log('Run `crewx shortcut install --force` to replace it.');
+            break;
+        case 'superseded':
+            console.log('⚠ The installed shortcut belongs to a newer CrewX version than the one running.');
+            console.log('Update CrewX before touching the shortcut.');
+            break;
+    }
+    for (const e of status.errors) {
+        console.log(`  note: ${e}`);
+    }
+}
+async function runStatus(args) {
+    const { json } = parseShortcutFlags(args, false);
+    let status;
+    try {
+        status = await (0, desktop_1.getShortcutStatus)();
+    }
+    catch (err) {
+        failWithError(err, json);
+    }
+    if (json) {
+        printJson(status);
+        return;
+    }
+    printStatusHuman(status);
+}
+async function runInstall(args) {
+    const { json, force } = parseShortcutFlags(args, true);
+    let result;
+    try {
+        result = await (0, desktop_1.installShortcut)({ force, onProgress });
+    }
+    catch (err) {
+        failWithError(err, json);
+    }
+    if (!result.supported) {
+        failNotWindows(json);
+    }
+    const failure = installFailureReason(result);
+    if (failure) {
+        if (json) {
+            printJson({ ...result, success: false });
+        }
+        else {
+            console.error(`✗ ${failure}`);
+        }
+        process.exit(1);
+    }
+    if (json) {
+        printJson({ ...result, success: true });
+        return;
+    }
+    if (result.changed) {
+        console.log('✓ CrewX desktop shortcut installed. Double-click "CrewX" on your Desktop to launch it.');
+    }
+    else {
+        console.log('✓ CrewX desktop shortcut is already up to date. Double-click "CrewX" on your Desktop to launch it.');
+    }
+    if (result.shortcutPath)
+        console.log(`  Shortcut: ${result.shortcutPath}`);
+}
+async function runUninstall(args) {
+    const { json } = parseShortcutFlags(args, false);
+    let result;
+    try {
+        result = await (0, desktop_1.uninstallShortcut)();
+    }
+    catch (err) {
+        failWithError(err, json);
+    }
+    if (!result.supported) {
+        failNotWindows(json);
+    }
+    const failure = uninstallFailureReason(result);
+    if (failure) {
+        if (json) {
+            printJson({ ...result, success: false });
+        }
+        else {
+            console.error(`✗ ${failure}`);
+            for (const e of result.errors) {
+                if (e !== failure)
+                    console.error(`  note: ${e}`);
+            }
+        }
+        process.exit(1);
+    }
+    if (json) {
+        printJson({ ...result, success: true });
+        return;
+    }
+    console.log('✓ CrewX desktop shortcut removed.');
+}
+function printHelp() {
+    console.log(`
+crewx shortcut — manage the Windows Desktop shortcut for CrewX
+
+Usage:
+  crewx shortcut status [--json]
+  crewx shortcut install [--force] [--json]
+  crewx shortcut uninstall [--json]
+
+Options:
+  --json     Print machine-readable JSON to stdout (progress/log always go to stderr)
+  --force    (install only) Overwrite a Desktop shortcut CrewX does not manage.
+             Never overwrites a shortcut created by a newer CrewX version.
+
+Notes:
+  Windows only. On macOS/Linux, \`status\` reports state "unsupported" (exit 0);
+  \`install\`/\`uninstall\` exit 1 with no changes made.
+`.trim());
+}
+async function handleShortcut(args) {
+    const subcommand = args[0];
+    if (!subcommand || subcommand === 'help' || subcommand === '--help' || subcommand === '-h') {
+        printHelp();
+        return;
+    }
+    const rest = args.slice(1);
+    switch (subcommand) {
+        case 'status':
+            return runStatus(rest);
+        case 'install':
+            return runInstall(rest);
+        case 'uninstall':
+            return runUninstall(rest);
+        default:
+            console.error(`Unknown shortcut subcommand: ${subcommand}`);
+            console.error('Run `crewx shortcut help` for usage.');
+            process.exit(1);
+    }
+}

package/dist/commands/slack.js

@@ -44,6 +44,7 @@ exports.handleSlack = handleSlack;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const https = __importStar(require("https"));
+const sdk_1 = require("@crewx/sdk");
 const adapter_slack_1 = require("@crewx/adapter-slack");
 const crewx_cli_1 = require("../bootstrap/crewx-cli");
 const markdown_1 = require("../slack/markdown");
@@ -186,7 +187,7 @@ async function handleListFiles(threadId) {
             console.log(`  📎 ${file.fileName}`);
             console.log(`     Size: ${formatFileSize(file.fileSize)}`);
             console.log(`     Path: ${file.filePath}`);
-            console.log(`     Downloaded: ${file.downloadedAt.toLocaleString()}`);
+            console.log(`     Downloaded: ${(0, sdk_1.formatDisplayTimestamp)(file.downloadedAt)}`);
             console.log('');
         }
         console.log(`Total: ${files.length} file${files.length > 1 ? 's' : ''}\n`);

package/dist/commands/stop.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Stop a running task through the SDK's cooperative-stop pipeline.
+ *
+ * `kill` is kept as a compatibility alias; both entry points use this same
+ * handler so server, CLI, and future adapters share one stop contract.
+ */
+/** Handle `crewx stop` and the compatibility `crewx kill` alias. */
+export declare function handleStop(args: string[], invokedAs?: 'stop' | 'kill'): Promise<void>;

package/dist/commands/stop.js

@@ -0,0 +1,119 @@
+"use strict";
+/**
+ * Stop a running task through the SDK's cooperative-stop pipeline.
+ *
+ * `kill` is kept as a compatibility alias; both entry points use this same
+ * handler so server, CLI, and future adapters share one stop contract.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleStop = handleStop;
+const sdk_1 = require("@crewx/sdk");
+const repository_1 = require("@crewx/sdk/repository");
+const cal_1 = require("./cal");
+function parseGrace(args) {
+    const flag = args.find((arg) => arg === '--grace' || arg.startsWith('--grace='));
+    if (!flag)
+        return { graceMs: 5_000 };
+    const raw = flag === '--grace'
+        ? args[args.indexOf(flag) + 1]
+        : flag.slice('--grace='.length);
+    const value = Number(raw);
+    if (!raw || !Number.isFinite(value) || value < 0) {
+        return { graceMs: 5_000, error: `Invalid --grace value: ${raw ?? '(missing)'}` };
+    }
+    return { graceMs: Math.trunc(value) };
+}
+function taskIdFromArgs(args) {
+    return args.find((arg, index) => {
+        if (arg === '--grace')
+            return false;
+        if (index > 0 && args[index - 1] === '--grace')
+            return false;
+        return !arg.startsWith('--');
+    });
+}
+function writeUsage() {
+    process.stderr.write('Error: Please provide a task ID or use --all to stop all running tasks.\n');
+    process.stderr.write('\nUsage:\n');
+    process.stderr.write('  crewx stop <task-id>    Stop a running task\n');
+    process.stderr.write('  crewx stop --all        Stop all running tasks\n');
+    process.stderr.write('  crewx stop <task-id> --grace=<ms>\n');
+}
+function formatGrace(graceMs) {
+    return `${graceMs / 1000}s`;
+}
+function reportResult(taskId, result, elapsedMs, graceMs) {
+    if (result.status === 'stopped') {
+        if (result.method === 'forced') {
+            process.stdout.write(`Stopped ${taskId} (forced after ${formatGrace(graceMs)} grace)\n`);
+        }
+        else {
+            process.stdout.write(`Stopped ${taskId} (cooperative, ${(elapsedMs / 1000).toFixed(1)}s)\n`);
+        }
+        return 0;
+    }
+    if (result.status === 'not_running') {
+        process.stdout.write(`Task ${taskId} is not running (${result.finalStatus ?? 'unknown'})\n`);
+        return 0;
+    }
+    if (result.status === 'already_requested') {
+        process.stderr.write(`Task ${taskId} already has a stop request; it remains ${result.finalStatus ?? 'running'}.\n`);
+        return 2;
+    }
+    if (result.status === 'ownership_unverified') {
+        const pid = result.pid ? ` (pid ${result.pid})` : '';
+        process.stderr.write(`Could not verify the process owner of ${taskId}; not terminated${pid}. ` +
+            'Row stays running — the reaper will settle it.\n');
+        return 2;
+    }
+    process.stderr.write(`Could not stop ${taskId}: ${result.error ?? 'unknown error'}\n`);
+    return 1;
+}
+/** Handle `crewx stop` and the compatibility `crewx kill` alias. */
+async function handleStop(args, invokedAs = 'stop') {
+    if (invokedAs === 'kill')
+        process.stderr.write('kill is an alias of stop\n');
+    const stopAll = args.includes('--all');
+    const { graceMs, error } = parseGrace(args);
+    if (error) {
+        process.stderr.write(`Error: ${error}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    const taskId = taskIdFromArgs(args);
+    if (!taskId && !stopAll) {
+        writeUsage();
+        process.exitCode = 1;
+        return;
+    }
+    const repo = new repository_1.TaskRepository();
+    const stopOne = async (id, withFooter) => {
+        const startedAt = Date.now();
+        const result = await (0, sdk_1.stopTask)(repo, id, { graceMs });
+        const exitCode = reportResult(id, result, Date.now() - startedAt, graceMs);
+        if (withFooter && (result.status === 'stopped' || result.status === 'not_running')) {
+            (0, cal_1.writeCalFooter)({
+                commandId: 'crewx.stop.done',
+                params: { taskId: id },
+            });
+        }
+        return exitCode;
+    };
+    if (stopAll) {
+        const running = repo.getRunningTasks();
+        if (running.length === 0) {
+            process.stdout.write('No running tasks found.\n');
+            return;
+        }
+        let exitCode = 0;
+        for (const task of running) {
+            exitCode = Math.max(exitCode, await stopOne(task.id, false));
+        }
+        if (exitCode > 0)
+            process.exitCode = exitCode;
+        return;
+    }
+    const exitCode = await stopOne(taskId, true);
+    if (exitCode > 0)
+        process.exitCode = exitCode;
+}

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/logging.d.ts

@@ -9,7 +9,7 @@
  *
  * Format mirrors cli-bak TaskManagementService for backward compatibility.
  */
-import type { Crewx } from '@crewx/sdk';
+import { type Crewx } from '@crewx/sdk';
 /**
  * Attach file-based logging to a Crewx instance.
  * Subscribes to task:start and task:end events and writes log files.

package/dist/logging.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachFileLogger = attachFileLogger;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const sdk_1 = require("@crewx/sdk");
 const CREWX_VERSION = '0.9.0-alpha.1';
 /** Format Date as YYYYMMDDTHHmmss (local time) */
 function formatTimestamp(date) {
@@ -52,7 +53,7 @@ function attachFileLogger(crewx, workspaceRoot) {
                 `CrewX Version: ${CREWX_VERSION}\n` +
                 `Mode: ${event.mode}\n` +
                 `Agent: ${event.agentRef}\n` +
-                `Started: ${event.timestamp.toLocaleString()}\n` +
+                `Started: ${(0, sdk_1.formatDisplayTimestamp)(event.timestamp)}\n` +
                 `Message: ${event.message}\n` +
                 `\n`;
             (0, fs_1.writeFileSync)(logFile, header, { encoding: 'utf8', mode: 0o600 });
@@ -66,7 +67,7 @@ function attachFileLogger(crewx, workspaceRoot) {
             const logFile = logFiles.get(event.traceId);
             if (!logFile)
                 return;
-            const ts = new Date().toLocaleString();
+            const ts = (0, sdk_1.formatDisplayTimestamp)(new Date());
             const status = event.error
                 ? `failed: ${event.error.message}`
                 : 'completed successfully';

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 and ~/.crewx .env files (does not override process.env)
+ *   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 and ~/.crewx .env files (does not override process.env)
+ *   3. Parse command
+ *   4. Dispatch to handler
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -45,20 +46,35 @@ var __importStar = (this && this.__importStar) || (function () {
 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");
-process.env.CREWX_CLI ??= (0, env_defaults_1.resolveCrewxCli)();
-process.env.CREWX_WORKSPACE ??= (0, env_defaults_1.resolveCrewxWorkspace)();
+const sdk_compat_1 = require("./utils/sdk-compat");
+const account_1 = require("@crewx/sdk/account");
+const inherited_trace_1 = require("./utils/inherited-trace");
+process.env.CREWX_CLI ??= sdk_compat_1.sdkCompat.resolveCrewxCli();
+process.env.CREWX_WORKSPACE ??= sdk_compat_1.sdkCompat.resolveCrewxWorkspace();
+// Load workspace .env before ~/.crewx/.env. The SDK-owned loader keeps CLI and
+// server bootstrap on the same process > workspace > home precedence contract.
+(0, account_1.loadCrewxEnvFiles)();
+// Receipt runner identity is a one-hop capability. Consume it before any
+// command/provider code can spawn a child process.
+(0, inherited_trace_1.consumeInheritedRunnerIdentity)();
+// ─── 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.
+sdk_compat_1.sdkCompat.initPricingRemote();
 // ─── Command Imports ──────────────────────────────────────────────────────────
 const query_1 = require("./commands/query");
 const execute_1 = require("./commands/execute");
 const agent_1 = require("./commands/agent");
 const ps_1 = require("./commands/ps");
-const kill_1 = require("./commands/kill");
+const stop_1 = require("./commands/stop");
 const result_1 = require("./commands/result");
 const restart_1 = require("./commands/restart");
 const log_1 = require("./commands/log");
 const doctor_1 = require("./commands/doctor");
 const init_1 = require("./commands/init");
+const shortcut_1 = require("./commands/shortcut");
+const publish_1 = require("./commands/publish");
 const builtin_1 = require("./builtin");
 const slack_1 = require("./commands/slack");
 const install_1 = require("./commands/hook/install");
@@ -69,6 +85,7 @@ const db_1 = require("./commands/db");
 const parse_common_flags_1 = require("./commands/parse-common-flags");
 const registry_1 = require("./commands/registry");
 const version_1 = require("./utils/version");
+const emit_trailer_1 = require("./commands/emit-trailer");
 /**
  * Dev-only SSOT assertion: bin/cli-commands.js must be the exact union of
  * KNOWN_COMMANDS ∪ BUILTIN_COMMAND_NAMES ∪ NOT_YET_MIGRATED from registry.ts.
@@ -93,7 +110,7 @@ async function assertSsotParity() {
             (extra.length ? `  CLI_SUBCOMMANDS has, registry missing: ${extra.join(', ')}` : ''));
     }
 }
-async function main() {
+async function main(emitState) {
     if (process.env['NODE_ENV'] === 'development') {
         await assertSsotParity();
     }
@@ -113,11 +130,11 @@ async function main() {
         // P0-2: q/x aliases
         case 'q':
         case 'query':
-            await (0, query_1.handleQuery)(args.slice(1));
+            await (0, query_1.handleQuery)(args.slice(1), command, emitState);
             return;
         case 'x':
         case 'execute':
-            await (0, execute_1.handleExecute)(args.slice(1));
+            await (0, execute_1.handleExecute)(args.slice(1), command, emitState);
             return;
         case 'agent':
             await (0, agent_1.handleAgent)(args.slice(1));
@@ -126,9 +143,12 @@ async function main() {
         case 'ps':
             await (0, ps_1.handlePs)(args.slice(1));
             return;
-        // P0-5: kill
+        // Task stop (kill is a compatibility alias)
+        case 'stop':
+            await (0, stop_1.handleStop)(args.slice(1), 'stop');
+            return;
         case 'kill':
-            await (0, kill_1.handleKill)(args.slice(1));
+            await (0, stop_1.handleStop)(args.slice(1), 'kill');
             return;
         // P0-6: result
         case 'result':
@@ -175,6 +195,14 @@ async function main() {
         case 'db':
             await (0, db_1.handleDb)(args.slice(1));
             return;
+        // Windows Desktop shortcut: crewx shortcut status|install|uninstall
+        case 'shortcut':
+            await (0, shortcut_1.handleShortcut)(args.slice(1));
+            return;
+        // crewx publish [dir] [--dry-run] [--version <semver>] [--json] [--upload]
+        case 'publish':
+            await (0, publish_1.handlePublish)(args.slice(1));
+            return;
         // SDK-009: slack / slack:files
         case 'slack':
         case 'slack:files':
@@ -256,12 +284,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
 
+  q/query/x/execute:
+    --detach/--async              Persist a receipt, launch a detached runner, and print task-id
+                                 (automatic inside an agent process; q/x stay synchronous elsewhere).
+    --wait                        Force synchronous execution, including inside an agent process.
+                                 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)
@@ -271,9 +306,12 @@ Agent Management:
 
 Task Management:
   ps                             List running tasks
-  kill <task-id>                 Kill a running task
-  kill --all                     Kill all running tasks
+  stop <task-id>                 Stop a running task (cooperative, then forced)
+  stop --all                     Stop all running tasks
+  kill <task-id>                 Alias for stop
   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:
@@ -285,6 +323,22 @@ Database:
   db push                        Sync DB schema to current code (additive only)
     --force                      Reset migration history + skip confirmation
     --dry-run                    Preview changes without applying
+  db migrate-task-logs           Backfill legacy tasks.logs into task_log_events
+    --dry-run                    Validate and estimate without writing
+    --apply                      Consistent backup + resumable task-by-task apply
+    --verify                     Check event/source invariants and parity
+
+Desktop Shortcut (Windows only):
+  shortcut status [--json]                Show current shortcut status
+  shortcut install [--force] [--json]     Install/repair the Desktop shortcut
+  shortcut uninstall [--json]             Remove the Desktop shortcut
+
+Publish:
+  publish [dir] [options]         Package a workspace as a distributable template archive
+    --dry-run                     Scan + build manifest only; do not write a .tgz
+    --version <ver>               Override manifest version (semver)
+    --json                        Print machine-readable JSON to stdout
+    --upload                      Submit + upload using the SDK account session
 
 Built-in Tools:
   memory <args>                  Memory tool
@@ -306,7 +360,9 @@ Global Options:
   --version, -v                  Show version
 `.trim());
 }
-main().catch((err) => {
+const emitState = (0, emit_trailer_1.createDelegationEmitState)();
+main(emitState).catch((err) => {
     console.error(err instanceof Error ? err.message : String(err));
+    (0, emit_trailer_1.emitDelegationResult)({ command: process.argv[2], isError: true, state: emitState });
     process.exit(err instanceof parse_common_flags_1.UnknownOptionError ? 2 : 1);
 });