chainlesschain 0.162.78 → 0.162.80

package/src/commands/scim.js

@@ -5,6 +5,7 @@
 
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   ensureSCIMTables,
@@ -348,7 +349,7 @@ export function registerScimCommand(program) {
     .requiredOption("-e, --external <id>", "external id")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const i = registerIdentityV2(id, {
         connectorId: opts.connector,
         externalId: opts.external,
@@ -412,7 +413,7 @@ export function registerScimCommand(program) {
     .option("-k, --kind <kind>", "job kind", "full")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const j = createSyncJobV2(id, {
         connectorId: opts.connector,
         kind: opts.kind,

package/src/commands/session.js

@@ -7,6 +7,7 @@ import fs from "fs";
 import path from "path";
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   listSessions,
@@ -288,7 +289,10 @@ export function registerSessionCommand(program) {
     .description(
       "Export a session as Markdown (chat-DB session, or JSONL agent session fallback)",
     )
-    .argument("<id>", "Session ID (or prefix; `last` = most recent agent session)")
+    .argument(
+      "<id>",
+      "Session ID (or prefix; `last` = most recent agent session)",
+    )
     .option("-o, --output <file>", "Output file path")
     .action(async (id, options) => {
       try {
@@ -315,9 +319,8 @@ export function registerSessionCommand(program) {
           const store = await import("../harness/jsonl-session-store.js");
           const sid = id === "last" ? store.getLastSessionId() : id;
           if (sid && store.sessionExists(sid)) {
-            const { renderAgentSessionMarkdown } = await import(
-              "../lib/agent-session-export.js"
-            );
+            const { renderAgentSessionMarkdown } =
+              await import("../lib/agent-session-export.js");
             markdown = renderAgentSessionMarkdown(sid, store.readEvents(sid), {
               exportedAt: new Date().toISOString(),
             });
@@ -1026,7 +1029,7 @@ export function registerSessionCommand(program) {
     .requiredOption("-m, --model <model>", "model")
     .option("--metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const c = registerConversationV2(id, {
         userId: opts.user,
         model: opts.model,
@@ -1092,7 +1095,7 @@ export function registerSessionCommand(program) {
     .option("-r, --role <role>", "role (user/assistant)", "user")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const t = createTurnV2(id, {
         conversationId: opts.conversation,
         role: opts.role,

package/src/commands/social.js

@@ -5,6 +5,7 @@
 
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   ensureSocialTables,
@@ -642,7 +643,7 @@ export function registerSocialCommand(program) {
         ensureGraphTables(db);
         graphLoadFromDb(db);
 
-        const metadata = options.metadata ? JSON.parse(options.metadata) : null;
+        const metadata = parseJsonOption(options.metadata, "--metadata", null);
         const result = graphAddEdge(db, source, target, options.type, {
           weight: Number(options.weight) || 1.0,
           metadata,
@@ -1206,7 +1207,7 @@ export function registerSocialCommand(program) {
     .requiredOption("-p, --peer <peerId>", "peer id")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const r = registerRelationshipV2(id, {
         userId: opts.user,
         peerId: opts.peer,
@@ -1272,7 +1273,7 @@ export function registerSocialCommand(program) {
     .requiredOption("-t, --topic <topic>", "topic")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const t = createThreadV2(id, {
         userId: opts.user,
         topic: opts.topic,

package/src/commands/sync.js

@@ -5,6 +5,7 @@
 
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   getSyncStatus,
@@ -373,7 +374,7 @@ export function registerSyncCommand(program) {
     .requiredOption("-k, --kind <kind>", "kind (file/note/...)")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const r = registerResourceV2(id, {
         owner: opts.owner,
         kind: opts.kind,
@@ -437,7 +438,7 @@ export function registerSyncCommand(program) {
     .option("-k, --kind <kind>", "run kind", "push")
     .option("-m, --metadata <json>", "metadata JSON", "{}")
     .action((id, opts) => {
-      const meta = JSON.parse(opts.metadata);
+      const meta = parseJsonOption(opts.metadata, "--metadata", {});
       const j = createSyncRunV2(id, {
         resourceId: opts.resource,
         kind: opts.kind,

package/src/commands/tenant.js

@@ -8,6 +8,7 @@
 import fs from "fs";
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   ensureTenantTables,
@@ -170,7 +171,7 @@ export function registerTenantCommand(program) {
       try {
         const ctx = await bootstrap({ verbose: program.opts().verbose });
         const db = _dbFromCtx(ctx);
-        const config = options.config ? JSON.parse(options.config) : null;
+        const config = parseJsonOption(options.config, "--config", null);
         const t = createTenant(db, {
           name,
           slug,
@@ -205,7 +206,7 @@ export function registerTenantCommand(program) {
         const db = _dbFromCtx(ctx);
         const updates = {};
         if (options.config !== undefined) {
-          updates.config = JSON.parse(options.config);
+          updates.config = parseJsonOption(options.config, "--config");
         }
         if (options.plan !== undefined) updates.plan = options.plan;
         if (options.status !== undefined) updates.status = options.status;
@@ -720,7 +721,8 @@ export function registerTenantCommand(program) {
       const config = { tenantId, plan: opts.plan };
       if (opts.owner) config.ownerId = opts.owner;
       if (opts.initialStatus) config.initialStatus = opts.initialStatus;
-      if (opts.metadata) config.metadata = JSON.parse(opts.metadata);
+      if (opts.metadata)
+        config.metadata = parseJsonOption(opts.metadata, "--metadata");
       console.log(JSON.stringify(registerTenantV2(null, config), null, 2));
     });
 
@@ -740,7 +742,8 @@ export function registerTenantCommand(program) {
     .action((tenantId, status, opts) => {
       const patch = {};
       if (opts.reason !== undefined) patch.reason = opts.reason;
-      if (opts.metadata) patch.metadata = JSON.parse(opts.metadata);
+      if (opts.metadata)
+        patch.metadata = parseJsonOption(opts.metadata, "--metadata");
       console.log(
         JSON.stringify(
           setTenantMaturityV2(null, tenantId, status, patch),
@@ -811,7 +814,8 @@ export function registerTenantCommand(program) {
         plan: opts.plan,
       };
       if (opts.expiresAt) config.expiresAt = Number(opts.expiresAt);
-      if (opts.metadata) config.metadata = JSON.parse(opts.metadata);
+      if (opts.metadata)
+        config.metadata = parseJsonOption(opts.metadata, "--metadata");
       console.log(
         JSON.stringify(registerSubscriptionV2(null, config), null, 2),
       );
@@ -833,7 +837,8 @@ export function registerTenantCommand(program) {
     .action((subscriptionId, status, opts) => {
       const patch = {};
       if (opts.reason !== undefined) patch.reason = opts.reason;
-      if (opts.metadata) patch.metadata = JSON.parse(opts.metadata);
+      if (opts.metadata)
+        patch.metadata = parseJsonOption(opts.metadata, "--metadata");
       console.log(
         JSON.stringify(
           setSubscriptionStatusV2(null, subscriptionId, status, patch),

package/src/commands/zkp.js

@@ -5,6 +5,7 @@
 
 import chalk from "chalk";
 import { logger } from "../lib/logger.js";
+import { parseJsonOption } from "../lib/parse-json-option.js";
 import { bootstrap, shutdown } from "../runtime/bootstrap.js";
 import {
   ensureZKPTables,
@@ -100,10 +101,8 @@ export function registerZkpCommand(program) {
         const db = ctx.db.getDatabase();
         ensureZKPTables(db);
 
-        const privateInputs = options.private
-          ? JSON.parse(options.private)
-          : {};
-        const publicInputs = options.public ? JSON.parse(options.public) : [];
+        const privateInputs = parseJsonOption(options.private, "--private", {});
+        const publicInputs = parseJsonOption(options.public, "--public", []);
         const proveOpts = options.scheme ? { scheme: options.scheme } : {};
         const proof = generateProof(
           db,
@@ -174,7 +173,7 @@ export function registerZkpCommand(program) {
     .option("--json", "Output as JSON")
     .action(async (options) => {
       try {
-        const claims = options.claims ? JSON.parse(options.claims) : {};
+        const claims = parseJsonOption(options.claims, "--claims", {});
         const disclose = options.disclose
           ? options.disclose.split(",").map((s) => s.trim())
           : [];
@@ -404,7 +403,7 @@ export function registerZkpCommand(program) {
         const db = ctx.db.getDatabase();
         ensureZKPTables(db);
 
-        const claims = options.claims ? JSON.parse(options.claims) : {};
+        const claims = parseJsonOption(options.claims, "--claims", {});
         const cred = registerCredential(db, {
           did: options.did,
           claims,
@@ -622,7 +621,7 @@ export function registerZkpCommand(program) {
         }
         const db = ctx.db.getDatabase();
         ensureZKPTables(db);
-        const def = options.definition ? JSON.parse(options.definition) : {};
+        const def = parseJsonOption(options.definition, "--definition", {});
         const circuit = compileCircuitV2(db, {
           name,
           definition: def,
@@ -675,8 +674,8 @@ export function registerZkpCommand(program) {
         ensureZKPTables(db);
         const proof = generateProofV2(db, {
           circuitId,
-          privateInputs: JSON.parse(options.private),
-          publicInputs: JSON.parse(options.public),
+          privateInputs: parseJsonOption(options.private, "--private"),
+          publicInputs: parseJsonOption(options.public, "--public"),
           scheme: options.scheme,
         });
         logger.success("Proof generated (V2)");

package/src/gateways/ws/ws-agent-handler.js

@@ -16,6 +16,7 @@ import {
   detectTaskType,
   selectModelForTask,
 } from "../../lib/task-model-selector.js";
+import { runnableTaskModel } from "../../lib/runnable-provider.js";
 import { PlanState } from "../../lib/plan-mode.js";
 import { CLISlotFiller } from "../../lib/slot-filler.js";
 import { createAbortError, isAbortError } from "../../lib/abort-utils.js";
@@ -63,7 +64,9 @@ export class WSAgentHandler {
       // Add user message
       session.messages.push({ role: "user", content: userMessage });
 
-      // Auto-select model based on task type
+      // Auto-select model based on task type — runnable-first: never switch
+      // onto a provider with no usable key (you'd just 401). Keep the
+      // configured model in that case.
       let activeModel = session.model;
       const taskDetection = detectTaskType(userMessage);
       if (taskDetection.confidence > 0.3) {
@@ -71,8 +74,14 @@ export class WSAgentHandler {
           session.provider,
           taskDetection.taskType,
         );
-        if (recommended && recommended !== activeModel) {
-          activeModel = recommended;
+        const switchTo = runnableTaskModel({
+          provider: session.provider,
+          currentModel: activeModel,
+          recommended,
+          apiKey: session.apiKey,
+        });
+        if (switchTo) {
+          activeModel = switchTo;
           this.interaction.emit("model-switch", {
             requestId,
             from: session.model,

package/src/gateways/ws/ws-server.js

@@ -855,6 +855,12 @@ export class ChainlessChainWSServer extends EventEmitter {
   }
 
   _startHeartbeat() {
+    // Idempotent: clear any existing timer first so a repeated start() (or a
+    // re-fired "listening" event) can't leak the previous interval — stop()
+    // only clears the most recent handle, so an overwrite would orphan it.
+    if (this._heartbeatTimer) {
+      clearInterval(this._heartbeatTimer);
+    }
     this._heartbeatTimer = setInterval(() => {
       for (const [clientId, client] of this.clients) {
         if (!client.alive) {

package/src/harness/background-task-manager.js

@@ -9,12 +9,7 @@
  */
 
 import { fork } from "node:child_process";
-import {
-  existsSync,
-  mkdirSync,
-  appendFileSync,
-  readFileSync,
-} from "node:fs";
+import { existsSync, mkdirSync, appendFileSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
 import { EventEmitter } from "node:events";
@@ -38,7 +33,10 @@ export const TaskStatus = {
   TIMEOUT: "timeout",
 };
 
-const RECOVERABLE_TASK_STATUSES = new Set([TaskStatus.PENDING, TaskStatus.RUNNING]);
+const RECOVERABLE_TASK_STATUSES = new Set([
+  TaskStatus.PENDING,
+  TaskStatus.RUNNING,
+]);
 
 export class BackgroundTaskManager extends EventEmitter {
   constructor(options = {}) {
@@ -47,7 +45,9 @@ export class BackgroundTaskManager extends EventEmitter {
     this.heartbeatTimeout = options.heartbeatTimeout || 60000;
     this.historyLimit = options.historyLimit || 50;
     this.nodeId =
-      options.nodeId || process.env.CC_NODE_ID || `${process.pid}@${process.platform}`;
+      options.nodeId ||
+      process.env.CC_NODE_ID ||
+      `${process.pid}@${process.platform}`;
     this.recoveryPolicy = options.recoveryPolicy || "claim-stale";
     this.staleNodeTimeout = options.staleNodeTimeout || 5 * 60 * 1000;
     this.tasks = new Map();
@@ -139,7 +139,12 @@ export class BackgroundTaskManager extends EventEmitter {
     child.on("exit", (code) => {
       if (task.status === TaskStatus.RUNNING) {
         if (code === 0) {
-          this._complete(taskId, TaskStatus.COMPLETED, "Process exited (0)", null);
+          this._complete(
+            taskId,
+            TaskStatus.COMPLETED,
+            "Process exited (0)",
+            null,
+          );
         } else {
           this._complete(
             taskId,
@@ -178,8 +183,12 @@ export class BackgroundTaskManager extends EventEmitter {
 
   getHistory(taskId, options = {}) {
     const history = this.get(taskId)?.history || [];
-    const limit = Number.isFinite(options.limit) ? Math.max(1, options.limit) : null;
-    const offset = Number.isFinite(options.offset) ? Math.max(0, options.offset) : 0;
+    const limit = Number.isFinite(options.limit)
+      ? Math.max(1, options.limit)
+      : null;
+    const offset = Number.isFinite(options.offset)
+      ? Math.max(0, options.offset)
+      : 0;
 
     if (limit === null && offset === 0) {
       return history;
@@ -192,7 +201,8 @@ export class BackgroundTaskManager extends EventEmitter {
       offset,
       limit: limit || history.length,
       hasMore: offset + items.length < history.length,
-      nextOffset: offset + items.length < history.length ? offset + items.length : null,
+      nextOffset:
+        offset + items.length < history.length ? offset + items.length : null,
     };
   }
 
@@ -212,9 +222,16 @@ export class BackgroundTaskManager extends EventEmitter {
     const child = this.processes.get(taskId);
     if (child) {
       child.kill("SIGTERM");
-      setTimeout(() => {
+      // Escalate to SIGKILL only if SIGTERM didn't take. unref() + clear-on-exit
+      // so a prompt exit (or process shutdown right after stop) isn't held open
+      // for the full grace period by this timer.
+      const killTimer = setTimeout(() => {
         if (child.exitCode === null) child.kill("SIGKILL");
       }, 2000);
+      if (killTimer && typeof killTimer.unref === "function") killTimer.unref();
+      if (typeof child.once === "function") {
+        child.once("exit", () => clearTimeout(killTimer));
+      }
     }
     const task = this.tasks.get(taskId);
     if (task) {
@@ -335,7 +352,8 @@ export class BackgroundTaskManager extends EventEmitter {
   }
 
   _normalizePersistedTask(entry) {
-    const task = entry?.kind === "task_snapshot" && entry.task ? entry.task : entry;
+    const task =
+      entry?.kind === "task_snapshot" && entry.task ? entry.task : entry;
 
     if (!task || typeof task !== "object") {
       return null;
@@ -354,7 +372,11 @@ export class BackgroundTaskManager extends EventEmitter {
     if (normalized.history.length === 0) {
       normalized.history.push({
         event: "loaded",
-        timestamp: normalized.completedAt || normalized.startedAt || normalized.createdAt || Date.now(),
+        timestamp:
+          normalized.completedAt ||
+          normalized.startedAt ||
+          normalized.createdAt ||
+          Date.now(),
         status: normalized.status,
       });
     }
@@ -414,8 +436,10 @@ export class BackgroundTaskManager extends EventEmitter {
 
   _decideRecovery(task) {
     const previousOwnerNodeId = task.ownerNodeId || null;
-    const sameNode = previousOwnerNodeId === this.nodeId || !previousOwnerNodeId;
-    const lastSeenAt = task.lastHeartbeat || task.startedAt || task.createdAt || 0;
+    const sameNode =
+      previousOwnerNodeId === this.nodeId || !previousOwnerNodeId;
+    const lastSeenAt =
+      task.lastHeartbeat || task.startedAt || task.createdAt || 0;
     const stale = Date.now() - lastSeenAt > this.staleNodeTimeout;
 
     if (sameNode) {
@@ -440,7 +464,9 @@ export class BackgroundTaskManager extends EventEmitter {
       return {
         shouldRecover: false,
         policy: this.recoveryPolicy,
-        reason: stale ? "foreign-node-stale-observed" : "foreign-node-active-observed",
+        reason: stale
+          ? "foreign-node-stale-observed"
+          : "foreign-node-active-observed",
         previousOwnerNodeId,
       };
     }