@withone/cli 1.21.0 → 1.23.0

package/README.md

@@ -380,6 +380,17 @@ one config
 
 Settings propagate automatically to all installed agent configs.
 
+#### `one config skills status` / `one config skills sync`
+
+`one init` copies the packaged skill files (`SKILL.md`, `references/`) into `~/.agents/skills/one/` and symlinks per-agent paths to that canonical directory. When the CLI self-updates, the skill files in the canonical dir would normally stay frozen at the version that was installed. To prevent stale docs, every CLI command checks a `.one-cli-version` marker in the canonical dir and silently refreshes the skill files if they don't match the running CLI version. No user action required.
+
+| Command | What it does |
+|---------|--------------|
+| `one config skills status` | Show installed skill version, current CLI version, and path |
+| `one config skills sync` | Force a re-copy of packaged skill files (for troubleshooting) |
+
+Auto-sync refuses to resurrect skills if you opted out of skill installation during `one init` — the canonical dir has to already exist.
+
 ## The workflow
 
 The power of One is in the workflow. Every interaction follows the same pattern:

package/dist/{chunk-KZOFPEHD.js → chunk-Z45IBT5P.js}

@@ -447,6 +447,22 @@ var execAsync = promisify(exec);
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function computeRetryDelay(onError, attempt) {
+  const base = onError.retryDelayMs ?? 1e3;
+  const max = onError.maxDelayMs ?? 3e4;
+  const backoff = onError.backoff ?? "fixed";
+  const retryIndex = attempt - 2;
+  let delay;
+  if (backoff === "exponential" || backoff === "exponential-jitter") {
+    delay = Math.min(base * Math.pow(2, retryIndex), max);
+    if (backoff === "exponential-jitter") {
+      delay = delay * (0.5 + Math.random() * 0.5);
+    }
+  } else {
+    delay = base;
+  }
+  return Math.round(delay);
+}
 function resolveSelector(selectorPath, context) {
   if (!selectorPath.startsWith("$.")) return selectorPath;
   const parts = selectorPath.slice(2).split(/\.|\[/).map((p) => p.replace(/\]$/, ""));
@@ -474,12 +490,22 @@ function resolveSelector(selectorPath, context) {
   }
   return current;
 }
+function shellQuote(value) {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
 function interpolateString(str, context) {
-  return str.replace(/\{\{(\$\.[^}]+)\}\}/g, (_match, selector) => {
+  return str.replace(/\{\{\s*(q\s+)?(\$\.[^}\s]+)\s*\}\}/g, (_match, qFlag, selector) => {
     const value = resolveSelector(selector, context);
-    if (value === void 0 || value === null) return "";
-    if (typeof value === "object") return JSON.stringify(value);
-    return String(value);
+    if (value === void 0 || value === null) return qFlag ? `''` : "";
+    if (typeof value === "object") {
+      console.warn(
+        `[flow] WARNING: Handlebars expression "{{${qFlag ? "q " : ""}${selector}}}" resolved to ${Array.isArray(value) ? "an array" : "an object"} and was stringified as JSON. To pass objects/arrays as native values, use a direct selector without {{ }}: "${selector}"`
+      );
+      const json = JSON.stringify(value);
+      return qFlag ? shellQuote(json) : json;
+    }
+    const str2 = String(value);
+    return qFlag ? shellQuote(str2) : str2;
   });
 }
 function resolveValue(value, context) {
@@ -487,7 +513,7 @@ function resolveValue(value, context) {
     if (value.startsWith("$.") && !value.includes("{{")) {
       return resolveSelector(value, context);
     }
-    if (value.includes("{{$.")) {
+    if (value.includes("{{$.") || /\{\{\s*q\s+\$\./.test(value)) {
       return interpolateString(value, context);
     }
     return value;
@@ -609,8 +635,8 @@ function executeTransformStep(step, context) {
 async function executeCodeStep(step, context, options) {
   const config = step.code;
   if (config.module) {
-    const output2 = await executeCodeModule(step.id, config.module, context, options);
-    return { status: "success", output: output2, response: output2 };
+    const output = await executeCodeModule(step.id, config.module, context, options);
+    return { status: "success", output, response: output };
   }
   if (typeof config.source !== "string") {
     throw new Error(`Code step "${step.id}" must define either "source" or "module"`);
@@ -618,9 +644,41 @@ async function executeCodeStep(step, context, options) {
   const AsyncFunction = Object.getPrototypeOf(async function() {
   }).constructor;
   const sandboxedRequire = createSandboxedRequire();
-  const fn = new AsyncFunction("$", "require", config.source);
-  const output = await fn(context, sandboxedRequire);
-  return { status: "success", output, response: output };
+  const sourceURL = `code:${step.id}`;
+  const taggedSource = `${config.source}
+//# sourceURL=${sourceURL}`;
+  const fn = new AsyncFunction("$", "require", taggedSource);
+  try {
+    const output = await fn(context, sandboxedRequire);
+    return { status: "success", output, response: output };
+  } catch (err) {
+    throw rewriteCodeStepError(err, step.id, config.source, sourceURL);
+  }
+}
+function rewriteCodeStepError(err, stepId, source, sourceURL) {
+  if (!(err instanceof Error)) return new Error(String(err));
+  const WRAPPER_LINE_OFFSET = 2;
+  const sourceLines = source.split("\n");
+  const stack = err.stack || "";
+  const re = new RegExp(`${sourceURL.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\$&")}:(\\d+):(\\d+)`);
+  const match = stack.match(re);
+  if (!match) {
+    err.message = `Code step "${stepId}" failed: ${err.message}`;
+    return err;
+  }
+  const wrappedLine = parseInt(match[1], 10);
+  const col = parseInt(match[2], 10);
+  const userLine = wrappedLine - WRAPPER_LINE_OFFSET;
+  const lineContent = sourceLines[userLine - 1] ?? "";
+  const trimmed = lineContent.trim();
+  err.message = `Code step "${stepId}" failed at line ${userLine}:${col}
+  ${trimmed}
+  ${err.message}`;
+  err.stack = stack.replace(
+    new RegExp(`(${sourceURL.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\$&")}:)(\\d+)`, "g"),
+    (_m, prefix, l) => `${prefix}${parseInt(l, 10) - WRAPPER_LINE_OFFSET}`
+  );
+  return err;
 }
 async function executeCodeModule(stepId, modulePath, context, options) {
   const rootDir = options.rootDir;
@@ -840,7 +898,7 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
   if (flowStack.includes(resolvedKey)) {
     throw new Error(`Circular flow detected: ${[...flowStack, resolvedKey].join(" \u2192 ")}`);
   }
-  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-CXZ6AWXT.js");
+  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-DFUFU2LM.js");
   const { flow: subFlow, rootDir: subRootDir } = loadFlowWithMeta2(resolvedKey);
   const subContext = await executeFlow(
     subFlow,
@@ -855,7 +913,7 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
   return {
     status: "success",
     output: subContext.steps,
-    response: subContext
+    response: subContext.steps
   };
 }
 async function executePaginateStep(step, context, api, permissions, allowedActionIds, options) {
@@ -951,13 +1009,14 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     try {
       if (attempt > 1) {
+        const delay = computeRetryDelay(step.onError, attempt);
         options.onEvent?.({
           event: "step:retry",
           stepId: step.id,
           attempt,
-          maxRetries: step.onError.retries
+          maxRetries: step.onError.retries,
+          delayMs: delay
         });
-        const delay = step.onError?.retryDelayMs || 1e3;
         await sleep2(delay);
       }
       if (options.mock && (step.type === "action" || step.type === "paginate" || step.type === "bash")) {
@@ -1014,7 +1073,14 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
           throw new Error(`Unknown step type: ${step.type}`);
       }
       result.durationMs = Date.now() - startTime;
-      if (attempt > 1) result.retries = attempt - 1;
+      if (attempt > 1) {
+        result.retries = attempt - 1;
+        options.onEvent?.({
+          event: "step:retry-success",
+          stepId: step.id,
+          retries: attempt - 1
+        });
+      }
       context.steps[step.id] = result;
       return result;
     } catch (err) {
@@ -1026,11 +1092,13 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
   }
   const errorMessage = lastError?.message || "Unknown error";
   const strategy = step.onError?.strategy || "fail";
+  const retriesUsed = Math.max(0, maxAttempts - 1);
   if (strategy === "continue") {
     const result = {
       status: "failed",
       error: errorMessage,
-      durationMs: Date.now() - startTime
+      durationMs: Date.now() - startTime,
+      retries: retriesUsed
     };
     context.steps[step.id] = result;
     return result;
@@ -1039,7 +1107,8 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
     const result = {
       status: "failed",
       error: errorMessage,
-      durationMs: Date.now() - startTime
+      durationMs: Date.now() - startTime,
+      retries: retriesUsed
     };
     context.steps[step.id] = result;
     return result;
@@ -1614,7 +1683,7 @@ Every step MUST have \`id\`, \`name\`, and \`type\`. The \`type\` determines whi
   for (const [name, fd] of Object.entries(FLOW_SCHEMA.stepCommonFields)) {
     sections.push(`| \`${name}\` | ${fd.type} | ${fd.required ? "yes" : "no"} | ${fd.description} |`);
   }
-  sections.push(`| \`onError\` | object | no | Error handling: \`{ "strategy": "${FLOW_SCHEMA.errorStrategies.join(" | ")}", "retries": 3, "retryDelayMs": 1000 }\` |`);
+  sections.push(`| \`onError\` | object | no | Error handling: \`{ "strategy": "${FLOW_SCHEMA.errorStrategies.join(" | ")}", "retries": 3, "retryDelayMs": 1000, "backoff": "fixed \\| exponential \\| exponential-jitter", "maxDelayMs": 30000 }\` |`);
   sections.push(`
 ## Step Types
 

package/dist/{flow-runner-CXZ6AWXT.js → flow-runner-DFUFU2LM.js}

@@ -11,7 +11,7 @@ import {
   saveFlow,
   summarizeFlowInputs,
   walkSteps
-} from "./chunk-KZOFPEHD.js";
+} from "./chunk-Z45IBT5P.js";
 export {
   FlowRunner,
   collectStepTypes,