@clawos-dev/clawd 0.2.101-beta.192.2f41caf → 0.2.101-beta.194.a406ba4

package/dist/cli.cjs

@@ -5378,6 +5378,36 @@ function ownerNamespace(ownerPrincipalId) {
 function namespacedExtId(slug, ownerPrincipalId) {
   return `${slug}-${ownerNamespace(ownerPrincipalId)}`;
 }
+function validateSimpleSemver(v2) {
+  if (typeof v2 !== "string") {
+    return { ok: false, reason: "version must be a string" };
+  }
+  const parts = v2.split(".");
+  if (parts.length !== 3) {
+    return { ok: false, reason: `"${v2}" \u2014 only MAJOR.MINOR.PATCH allowed` };
+  }
+  for (const p2 of parts) {
+    if (!/^\d+$/.test(p2)) {
+      return { ok: false, reason: `"${v2}" \u2014 only numeric segments allowed` };
+    }
+  }
+  return { ok: true };
+}
+function compareSimpleSemver(a, b2) {
+  const pa = parseOrThrow(a);
+  const pb = parseOrThrow(b2);
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] < pb[i]) return -1;
+    if (pa[i] > pb[i]) return 1;
+  }
+  return 0;
+}
+function parseOrThrow(v2) {
+  const r = validateSimpleSemver(v2);
+  if (!r.ok) throw new Error(r.reason);
+  const [a, b2, c] = v2.split(".").map((p2) => parseInt(p2, 10));
+  return [a, b2, c];
+}
 var EXT_ID_REGEX, ExtensionStateSchema, ExtensionManifestSchema, ExtensionRecordSchema, PublishedSnapshotSchema, ChannelRefSchema, SourceRefSchema, PublishedExtensionRecordSchema, PublishCheckSchema, PublishStatusResultSchema;
 var init_extension = __esm({
   "../protocol/src/extension.ts"() {
@@ -31201,7 +31231,11 @@ function tryFlushPending(state, deps) {
   const payload = deps.encodeStdin(text, { sessionId: state.file.sessionId });
   return [{ kind: "write-stdin", payload }];
 }
-function rgDbg(event, info) {
+function rgDbg(deps, event, info) {
+  if (deps.logger) {
+    deps.logger.debug(`[RG] ${event}`, info);
+    return;
+  }
   console.debug(`[RG] ${event}`, info);
 }
 function resetReadyGate(next) {
@@ -31477,7 +31511,7 @@ function applyCommand(state, command, deps) {
         const payload = deps.encodeStdin(command.text, { sessionId });
         effects.push({ kind: "write-stdin", payload });
       }
-      rgDbg("send", {
+      rgDbg(deps, "send", {
         sid: sessionId,
         mode: deps.mode ?? "sdk",
         procAliveBefore,
@@ -31849,13 +31883,13 @@ function reduceSession(state, input, deps) {
     }
     case "ready-detected": {
       if (deps.mode !== "tui") {
-        rgDbg("ready-input", { sid: state.file.sessionId, skipped: "non-tui-mode" });
+        rgDbg(deps, "ready-input", { sid: state.file.sessionId, skipped: "non-tui-mode" });
         return { state, effects: [] };
       }
       const next = cloneState(state);
       next.readyForSend = true;
       const flushEffects = tryFlushPending(next, deps);
-      rgDbg("ready-input", {
+      rgDbg(deps, "ready-input", {
         sid: next.file.sessionId,
         wroteStdin: flushEffects.length > 0,
         readyAfter: next.readyForSend,
@@ -32028,7 +32062,9 @@ var SessionRunner = class {
       ownerDisplayName: this.hooks.ownerDisplayName,
       personaRoot: this.hooks.personaRoot,
       // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
-      mode: this.hooks.mode
+      mode: this.hooks.mode,
+      // [RG-DBG] 注入 logger 让 reducer rgDbg 走 pino 进 clawd.log；定位完跟 rgDbg 一起删
+      logger: this.hooks.logger
     };
     const { state, effects } = reduceSession(this.state, inputMsg, deps);
     this.state = state;
@@ -32207,7 +32243,7 @@ var SessionRunner = class {
         this.doKill(effect.signal);
         break;
       case "write-stdin":
-        console.debug("[RG] write-stdin", {
+        this.hooks.logger?.debug("[RG] write-stdin", {
           procAlive: !!this.proc,
           stdinWritable: !!this.proc?.stdin,
           len: effect.payload.length,
@@ -33863,12 +33899,12 @@ var SessionManager = class {
    */
   dispatchReadyDetected(toolSessionId) {
     if (this.deps.mode !== "tui") {
-      console.debug("[RG] mgr-disp", { tsid: toolSessionId, skipped: "non-tui-mode" });
+      this.deps.logger?.debug("[RG] mgr-disp", { tsid: toolSessionId, skipped: "non-tui-mode" });
       return;
     }
     const sid = this.sessionIdByToolSid(toolSessionId);
     const runner = sid ? this.runners.get(sid) : void 0;
-    console.debug("[RG] mgr-disp", {
+    this.deps.logger?.debug("[RG] mgr-disp", {
       tsid: toolSessionId,
       sid: sid ?? null,
       runnerFound: !!runner
@@ -34997,20 +35033,19 @@ var PtyChildProcess = class extends import_node_events.EventEmitter {
       if (match) {
         const paste = match[1];
         const enter = match[2];
-        console.debug("[RG] pty-paste", { pasteLen: paste.length, enterLen: enter.length });
+        logger?.debug("[RG] pty-paste", { tag, pasteLen: paste.length, enterLen: enter.length });
         pty.write(paste);
         setTimeout(() => {
           try {
             pty.write(enter);
-            console.debug("[RG] pty-paste-enter", { wrote: "\\r", disposed: false });
-            logger?.debug("pty bracketed paste submit \\r delayed", { tag, pid: this.pid });
+            logger?.debug("[RG] pty-paste-enter", { tag, wrote: "\\r", disposed: false });
           } catch (err) {
-            console.debug("[RG] pty-paste-enter", { error: err.message });
+            logger?.debug("[RG] pty-paste-enter", { tag, error: err.message });
             logger?.warn("pty delayed \\r failed", { tag, error: err.message });
           }
-        }, 120);
+        }, 240);
       } else {
-        console.debug("[RG] pty-write-direct", { len: data.length });
+        logger?.debug("[RG] pty-write-direct", { tag, len: data.length });
         pty.write(data);
       }
     };
@@ -35251,14 +35286,21 @@ function createReadyDetector(opts) {
       quietTimer = null;
     }
   };
+  const dbg = (info) => {
+    if (opts.logger) {
+      opts.logger.debug("[RG] det-state", info);
+      return;
+    }
+    console.debug("[RG] det-state", info);
+  };
   const quietFire = () => {
     quietTimer = null;
     if (disposed) return;
     if (!scanReadyFrame()) {
-      console.debug("[RG] det-state", { event: "quiet-fire-but-not-ready-anymore" });
+      dbg({ event: "quiet-fire-but-not-ready-anymore" });
       return;
     }
-    console.debug("[RG] det-state", { event: "quiet-fire \u2192 onReady" });
+    dbg({ event: "quiet-fire \u2192 onReady" });
     opts.onReady();
   };
   let prevReady = false;
@@ -35268,13 +35310,13 @@ function createReadyDetector(opts) {
     if (!ready) {
       clearQuiet();
       if (prevReady) {
-        console.debug("[RG] det-state", { event: "ready \u2192 not-ready" });
+        dbg({ event: "ready \u2192 not-ready" });
         prevReady = false;
       }
       return;
     }
     if (!prevReady) {
-      console.debug("[RG] det-state", { event: "not-ready \u2192 ready-candidate (quiet timer set)" });
+      dbg({ event: "not-ready \u2192 ready-candidate (quiet timer set)" });
       prevReady = true;
     }
     clearQuiet();
@@ -35391,7 +35433,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
         if (!ctx.toolSessionId || !this.tuiOpts.onReady) return;
         this.tuiLogger?.debug("ready-detected", { toolSessionId: ctx.toolSessionId });
         this.tuiOpts.onReady(ctx.toolSessionId);
-      }
+      },
+      // [RG-DBG] 排查 ReadyGate 偶现卡输入用；定位完跟所有 [RG] 日志一起删
+      logger: this.tuiLogger
     });
     if (ctx.toolSessionId && this.tuiOpts.onDetectorRegister) {
       this.tuiOpts.onDetectorRegister(ctx.toolSessionId, detector);
@@ -40511,7 +40555,7 @@ function computePublishCheck(args) {
     }
     return { kind: "error-same-hash", version: head.version };
   }
-  const cmp = compareSemver(localVersion, head.version);
+  const cmp = compareSimpleSemver(localVersion, head.version);
   if (cmp > 0) {
     return {
       kind: "ready-new-version",
@@ -40532,28 +40576,6 @@ function computePublishCheck(args) {
     publishedVersion: head.version
   };
 }
-function compareSemver(a, b2) {
-  const pa = parseSimpleSemver(a);
-  const pb = parseSimpleSemver(b2);
-  for (let i = 0; i < 3; i++) {
-    if (pa[i] < pb[i]) return -1;
-    if (pa[i] > pb[i]) return 1;
-  }
-  return 0;
-}
-function parseSimpleSemver(v2) {
-  const parts = v2.split(".");
-  if (parts.length !== 3) {
-    throw new Error(`unsupported version "${v2}" \u2014 only MAJOR.MINOR.PATCH allowed`);
-  }
-  const nums = parts.map((p2) => {
-    if (!/^\d+$/.test(p2)) {
-      throw new Error(`unsupported version "${v2}" \u2014 only numeric segments allowed`);
-    }
-    return parseInt(p2, 10);
-  });
-  return nums;
-}
 
 // src/extension/install-flow.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
@@ -40842,6 +40864,37 @@ function pickStringField(frame, name) {
   }
   return v2;
 }
+function pickOptionalString(frame, name) {
+  const v2 = frame[name];
+  if (v2 === void 0 || v2 === null) return null;
+  if (typeof v2 !== "string") {
+    throw new ClawdError(ERROR_CODES.INVALID_PARAM, `${name} must be string`);
+  }
+  return v2;
+}
+async function rewriteManifestVersion(root, extId, newVersion, previousPublishedVersion) {
+  const v2 = validateSimpleSemver(newVersion);
+  if (!v2.ok) {
+    throw new ClawdError(
+      ERROR_CODES.VALIDATION_ERROR,
+      `INVALID_VERSION: ${v2.reason}`
+    );
+  }
+  if (previousPublishedVersion !== void 0) {
+    if (compareSimpleSemver(newVersion, previousPublishedVersion) <= 0) {
+      throw new ClawdError(
+        ERROR_CODES.VALIDATION_ERROR,
+        `VERSION_NOT_BUMPED: newVersion ${newVersion} must be > published ${previousPublishedVersion}`
+      );
+    }
+  }
+  const manifestPath = import_node_path38.default.join(root, extId, "manifest.json");
+  const manifest = await readManifest(root, extId);
+  const next = { ...manifest, version: newVersion };
+  const tmp = `${manifestPath}.tmp`;
+  await import_promises7.default.writeFile(tmp, JSON.stringify(next, null, 2));
+  await import_promises7.default.rename(tmp, manifestPath);
+}
 async function readManifest(root, extId) {
   const file = import_node_path38.default.join(root, extId, "manifest.json");
   let raw;
@@ -40933,6 +40986,10 @@ function buildExtensionHandlers(deps) {
   const publish = async (frame, _client, ctx) => {
     assertOwner(ctx);
     const extId = pickExtId(frame);
+    const newVersion = pickOptionalString(frame, "newVersion");
+    if (newVersion !== null) {
+      await rewriteManifestVersion(deps.root, extId, newVersion, deps.publishedChannelStore.get(extId)?.version);
+    }
     const { manifest, contentHash } = await buildSnapshotMeta(extId);
     const head = deps.publishedChannelStore.get(extId);
     const check = computePublishCheck({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.101-beta.192.2f41caf",
+  "version": "0.2.101-beta.194.a406ba4",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",