@crewx/cli 0.9.0-rc.93 → 0.9.0-rc.95

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

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

package/dist/main.js

@@ -6,7 +6,7 @@
  *
  * Boot sequence:
  *   1. Inject CREWX_CLI / CREWX_WORKSPACE env defaults (must be first)
- *   2. Load workspace .env (does not override existing process.env values)
+ *   2. Load workspace and ~/.crewx .env files (does not override process.env)
  *   3. Parse command
  *   4. Dispatch to handler
  */
@@ -47,15 +47,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // ─── P0-1: Env Bootstrap ─────────────────────────────────────────────────────
 // Must run before any other code that might use process.env.CREWX_CLI.
 const sdk_compat_1 = require("./utils/sdk-compat");
-const dotenv = __importStar(require("dotenv"));
-const path_1 = require("path");
+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 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 });
+// 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
@@ -66,7 +67,7 @@ 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");
@@ -142,9 +143,12 @@ async function main(emitState) {
         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':
@@ -287,10 +291,10 @@ Query / Execute:
     --                           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.
+  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:
@@ -302,8 +306,9 @@ 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.

package/dist/utils/inherited-trace.d.ts

@@ -1,4 +1,19 @@
 import type { TraceContext } from '@crewx/sdk';
+export interface InheritedRunnerIdentity {
+    assignedTaskId?: string;
+    detachedRunner: boolean;
+}
+/**
+ * Consume the runner-only identity exactly once.
+ *
+ * These variables are a one-hop capability, not trace context. Keeping the
+ * values in this module lets the current CLI process use them while deleting
+ * them from process.env prevents later child processes from inheriting the
+ * receipt runner identity.
+ */
+export declare function consumeInheritedRunnerIdentity(): InheritedRunnerIdentity;
+/** Test-only reset for the module-level one-shot cache. */
+export declare function resetInheritedRunnerIdentityForTests(): void;
 /**
  * Read cross-process trace context from inherited environment variables.
  *
@@ -10,3 +25,12 @@ import type { TraceContext } from '@crewx/sdk';
  * Returns undefined when none of the three vars are set (root invocation).
  */
 export declare function readInheritedTrace(): TraceContext | undefined;
+/**
+ * Read the pre-assigned task id carried only by a detached runner.
+ *
+ * This is deliberately separate from readInheritedTrace(): trace variables
+ * describe the caller's chain and must not be used as this task's identity.
+ */
+export declare function readRunnerAssignment(): string | undefined;
+/** Return true only for the final detached runner process. */
+export declare function isDetachedRunner(): boolean;

package/dist/utils/inherited-trace.js

@@ -1,6 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.consumeInheritedRunnerIdentity = consumeInheritedRunnerIdentity;
+exports.resetInheritedRunnerIdentityForTests = resetInheritedRunnerIdentityForTests;
 exports.readInheritedTrace = readInheritedTrace;
+exports.readRunnerAssignment = readRunnerAssignment;
+exports.isDetachedRunner = isDetachedRunner;
+let inheritedRunnerIdentity;
+/**
+ * Consume the runner-only identity exactly once.
+ *
+ * These variables are a one-hop capability, not trace context. Keeping the
+ * values in this module lets the current CLI process use them while deleting
+ * them from process.env prevents later child processes from inheriting the
+ * receipt runner identity.
+ */
+function consumeInheritedRunnerIdentity() {
+    if (inheritedRunnerIdentity !== undefined)
+        return inheritedRunnerIdentity;
+    const assignedTaskId = process.env['CREWX_ASSIGNED_TASK_ID']?.trim() || undefined;
+    const detachedRunner = process.env['CREWX_DETACHED_RUNNER'] === '1';
+    delete process.env['CREWX_ASSIGNED_TASK_ID'];
+    delete process.env['CREWX_DETACHED_RUNNER'];
+    inheritedRunnerIdentity = { assignedTaskId, detachedRunner };
+    return inheritedRunnerIdentity;
+}
+/** Test-only reset for the module-level one-shot cache. */
+function resetInheritedRunnerIdentityForTests() {
+    inheritedRunnerIdentity = undefined;
+}
 /**
  * Read cross-process trace context from inherited environment variables.
  *
@@ -23,3 +50,16 @@ function readInheritedTrace() {
         callerAgentId,
     };
 }
+/**
+ * Read the pre-assigned task id carried only by a detached runner.
+ *
+ * This is deliberately separate from readInheritedTrace(): trace variables
+ * describe the caller's chain and must not be used as this task's identity.
+ */
+function readRunnerAssignment() {
+    return consumeInheritedRunnerIdentity().assignedTaskId;
+}
+/** Return true only for the final detached runner process. */
+function isDetachedRunner() {
+    return consumeInheritedRunnerIdentity().detachedRunner;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewx/cli",
-  "version": "0.9.0-rc.93",
+  "version": "0.9.0-rc.95",
   "license": "UNLICENSED",
   "engines": {
     "node": ">=20.19.0"
@@ -25,18 +25,19 @@
     "better-sqlite3": "*",
     "dotenv": "17.2.3",
     "isomorphic-git": "1.37.1",
-    "@crewx/sdk": "0.9.0-rc.93",
-    "@crewx/memory": "0.1.23-rc.110",
-    "@crewx/search": "0.1.10-rc.89",
-    "@crewx/wbs": "0.1.10-rc.119",
-    "@crewx/doc": "0.1.9-rc.86",
-    "@crewx/cron": "0.1.10-rc.128",
+    "@crewx/sdk": "0.9.0-rc.95",
+    "@crewx/memory": "0.1.23-rc.112",
+    "@crewx/search": "0.1.10-rc.91",
+    "@crewx/doc": "0.1.9-rc.88",
+    "@crewx/knowledge-core": "0.1.17-rc.105",
+    "@crewx/wbs": "0.1.10-rc.121",
+    "@crewx/workflow": "0.3.22-rc.141",
     "@crewx/skill": "0.1.20",
-    "@crewx/workflow": "0.3.22-rc.139",
-    "@crewx/wi": "0.1.10-rc.113",
-    "@crewx/chromex": "0.1.0-rc.126",
-    "@crewx/notify": "0.1.0-rc.64",
-    "@crewx/shared": "0.0.6"
+    "@crewx/wi": "0.1.10-rc.115",
+    "@crewx/cron": "0.1.10-rc.130",
+    "@crewx/chromex": "0.1.0-rc.128",
+    "@crewx/shared": "0.0.6",
+    "@crewx/notify": "0.1.0-rc.66"
   },
   "devDependencies": {
     "@types/better-sqlite3": "*",