@zubriq/code 0.19.8-2 → 0.19.9-2

package/dist/chunks/{chunk-FVMWEHWU.js → chunk-3B26UVCX.js}

@@ -11,12 +11,13 @@ import {
 import {
   CRON_TASKS_DISPLAY_PATH,
   addCronTask,
+  appendCronRun,
   generateCronTaskId,
   getCronFilePath,
   readCronTasks,
   removeCronTasks,
   updateCronTasks
-} from "./chunk-2NL7ED5Q.js";
+} from "./chunk-FV7425LN.js";
 import {
   ToolNames
 } from "./chunk-X3YGAX7V.js";
@@ -282,6 +283,42 @@ var CronScheduler = class {
   // the live job away (or clear its pendingRemoval guard) as if it had
   // been deleted on disk.
   pendingAdd = /* @__PURE__ */ new Set();
+  // Durable ids whose lastFiredAt persist is in flight after a fire — the tick
+  // (on-time) OR a catch-up delivery. A reload racing that async write reads the
+  // stale disk stamp, so it must not re-detect and re-fire the same slot. Only
+  // populated once a fire has actually been stamped/delivered, so a catch-up that
+  // was merely buffered and then dropped never enters it and still re-detects.
+  //
+  // REF-COUNTED per id (not a plain Set): the same task can have two persists in
+  // flight at once (it fired again before the first write landed). Clearing on
+  // the FIRST settle would drop the guard while the second write is still
+  // pending; the count keeps it until the LAST in-flight persist for that id
+  // settles.
+  //
+  // LIMITATION: this guard is INSTANCE-scoped in-memory state. It protects
+  // against a reload racing a persist WITHIN one scheduler. It does NOT survive
+  // a new scheduler instance (daemon restart, keepalive revive, session reload):
+  // a fresh instance starts with an empty map, so if the previous instance died
+  // with a persist still in flight, the new one reads the stale on-disk stamp
+  // and can re-fire that slot once. Fully closing that narrow cross-instance
+  // window would need a durable stamp (in the tasks file or a lock file); it's
+  // accepted here as a sub-second restart-timing edge.
+  firePersistPending = /* @__PURE__ */ new Map();
+  markFirePersistPending(ids) {
+    for (const id of ids) {
+      this.firePersistPending.set(
+        id,
+        (this.firePersistPending.get(id) ?? 0) + 1
+      );
+    }
+  }
+  clearFirePersistPending(ids) {
+    for (const id of ids) {
+      const next = (this.firePersistPending.get(id) ?? 0) - 1;
+      if (next > 0) this.firePersistPending.set(id, next);
+      else this.firePersistPending.delete(id);
+    }
+  }
   fileWatcher = null;
   lockProbeTimer = null;
   debounceTimer = null;
@@ -567,9 +604,12 @@ var CronScheduler = class {
     const missedOneShots = [];
     const catchUpIds = [];
     const finalTasks = [];
-    if (handleMissed) {
+    {
       for (const t of tasks) {
         if (this.pendingRemoval.has(t.id)) continue;
+        const responsibleForMissed = typeof t.sessionId === "string" && t.sessionId.length > 0 ? t.sessionId === this.sessionId : handleMissed;
+        if (!responsibleForMissed) continue;
+        if (this.firePersistPending.has(t.id)) continue;
         const jitter = computeJitter(t.id, t.cron, t.recurring);
         const anchor = t.recurring ? t.lastFiredAt ?? t.createdAt : t.createdAt;
         const nextFire = computeNextFireMs(t.cron, anchor, jitter);
@@ -733,16 +773,28 @@ var CronScheduler = class {
       if (fired !== void 0) stamps.set(id, fired);
     }
     if (stamps.size === 0) return;
+    const guarded = [...stamps.keys()];
+    this.markFirePersistPending(guarded);
     this.trackPersist(
       updateCronTasks(this.projectRoot, (tasks) => {
         let changed = false;
         const next = tasks.map((t) => {
           const stamp = stamps.get(t.id);
-          if (stamp === void 0 || t.lastFiredAt === stamp) return t;
+          if (stamp === void 0 || (t.lastFiredAt ?? 0) >= stamp) return t;
           changed = true;
-          return { ...t, lastFiredAt: stamp };
+          return {
+            ...t,
+            lastFiredAt: stamp,
+            runs: appendCronRun(t.runs, {
+              at: stamp,
+              kind: "catch-up",
+              ...this.sessionId ? { sessionId: this.sessionId } : {}
+            })
+          };
         });
         return changed ? next : tasks;
+      }).finally(() => {
+        this.clearFirePersistPending(guarded);
       })
     );
   }
@@ -911,6 +963,20 @@ var CronScheduler = class {
     this._disabled = true;
     this.stop();
   }
+  /**
+   * Whether THIS session should fire a given durable job:
+   *  - A session-bound task (`boundSessionId` set) fires only in its own
+   *    session, independent of the per-project lock — so each task's fires
+   *    land in its dedicated transcript and no two sessions race it.
+   *  - An unbound task fires only in the lock owner (the legacy shared model).
+   * A task bound to a *different* session is never fired here.
+   */
+  #shouldFireDurable(job) {
+    if (job.boundSessionId !== void 0) {
+      return job.boundSessionId === this.sessionId;
+    }
+    return this.isOwner;
+  }
   /**
    * Manual tick — checks all jobs against the current time and fires those
    * that are due. Exported for testing.
@@ -922,7 +988,7 @@ var CronScheduler = class {
     const firedAt = /* @__PURE__ */ new Map();
     const removedIds = [];
     for (const job of this.jobs.values()) {
-      if (job.durable && !this.isOwner) continue;
+      if (job.durable && !this.#shouldFireDurable(job)) continue;
       if (job.durable && this.skipDurableFire?.(job)) {
         debugLogger.debug(
           `Skipping durable job ${job.id} (tick): consumer cannot run it`
@@ -940,13 +1006,30 @@ var CronScheduler = class {
     if (this.projectRoot && (firedAt.size > 0 || removedIds.length > 0)) {
       for (const id of removedIds) this.pendingRemoval.add(id);
       const removed = new Set(removedIds);
+      const guarded = [...firedAt.keys()];
+      this.markFirePersistPending(guarded);
       this.trackPersist(
         updateCronTasks(
           this.projectRoot,
-          (tasks) => tasks.filter((t) => !removed.has(t.id)).map(
-            (t) => firedAt.has(t.id) ? { ...t, lastFiredAt: firedAt.get(t.id) } : t
-          )
-        )
+          (tasks) => tasks.filter((t) => !removed.has(t.id)).map((t) => {
+            const stamp = firedAt.get(t.id);
+            if (stamp === void 0 || (t.lastFiredAt ?? 0) >= stamp)
+              return t;
+            return {
+              ...t,
+              lastFiredAt: stamp,
+              runs: appendCronRun(t.runs, {
+                at: stamp,
+                kind: "scheduled",
+                // The owner session that ran this fire — links the run back
+                // to its transcript. Set whenever a durable fire persists.
+                ...this.sessionId ? { sessionId: this.sessionId } : {}
+              })
+            };
+          })
+        ).finally(() => {
+          this.clearFirePersistPending(guarded);
+        })
       );
     }
     for (const wakeup of this.wakeups.values()) {
@@ -1073,7 +1156,8 @@ function durableTaskToJob(task, recurringMaxAgeMs, existing) {
     expiresAt: task.recurring ? task.createdAt + recurringMaxAgeMs : Infinity,
     lastFiredAt: task.lastFiredAt ?? void 0,
     jitterMs,
-    durable: true
+    durable: true,
+    ...task.sessionId ? { boundSessionId: task.sessionId } : {}
   };
 }
 __name(durableTaskToJob, "durableTaskToJob");
@@ -1084,7 +1168,8 @@ function jobToDurableTask(job) {
     prompt: job.prompt,
     recurring: job.recurring,
     createdAt: job.createdAt,
-    lastFiredAt: job.lastFiredAt ?? null
+    lastFiredAt: job.lastFiredAt ?? null,
+    ...job.boundSessionId ? { sessionId: job.boundSessionId } : {}
   };
 }
 __name(jobToDurableTask, "jobToDurableTask");
@@ -1098,6 +1183,22 @@ function computeNextFireMs(cronExpr, afterMs, jitterMs) {
   }
 }
 __name(computeNextFireMs, "computeNextFireMs");
+var nextDurableFireCache = /* @__PURE__ */ new Map();
+var NEXT_DURABLE_FIRE_CACHE_MAX = 512;
+function nextDurableFireMs(task) {
+  const anchor = task.recurring ? task.lastFiredAt ?? task.createdAt : task.createdAt;
+  const key = `${task.id}\0${task.cron}\0${task.recurring ? 1 : 0}\0${anchor}`;
+  const cached = nextDurableFireCache.get(key);
+  if (cached !== void 0) return cached;
+  const jitter = computeJitter(task.id, task.cron, task.recurring);
+  const result = computeNextFireMs(task.cron, anchor, jitter);
+  if (nextDurableFireCache.size >= NEXT_DURABLE_FIRE_CACHE_MAX) {
+    nextDurableFireCache.clear();
+  }
+  nextDurableFireCache.set(key, result);
+  return result;
+}
+__name(nextDurableFireMs, "nextDurableFireMs");
 
 export {
   MAX_JOBS,
@@ -1107,5 +1208,6 @@ export {
   WAKEUP_MAX_SECONDS,
   clampWakeupSeconds,
   CronScheduler,
-  buildMissedCronNotification
+  buildMissedCronNotification,
+  nextDurableFireMs
 };

package/dist/chunks/{chunk-W6RH6KHR.js → chunk-3GPVYALM.js}

@@ -1,9 +1,11 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  TextTokenizer,
   isSupportedImageMimeType
-} from "./chunk-PIORL4OD.js";
+} from "./chunk-UKV3D7WB.js";
+import {
+  TextTokenizer
+} from "./chunk-CCGOFQV3.js";
 import {
   createDebugLogger
 } from "./chunk-22MNNNXE.js";

package/dist/chunks/{chunk-SVK2TREP.js → chunk-3KV2TYC4.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   runExitCleanup
-} from "./chunk-ZCMLUE4O.js";
+} from "./chunk-27A4SPWJ.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/dist/chunks/{chunk-G7ZG7CA6.js → chunk-3UP777ZS.js}

@@ -29,7 +29,7 @@ function normalizeMaxQueuedBytes(value) {
   return value;
 }
 __name(normalizeMaxQueuedBytes, "normalizeMaxQueuedBytes");
-function serializedByteLength(event) {
+function serializedBridgeEventByteLength(event) {
   try {
     const serialized = JSON.stringify(event);
     if (serialized === void 0) return 0;
@@ -39,7 +39,7 @@ function serializedByteLength(event) {
     return 0;
   }
 }
-__name(serializedByteLength, "serializedByteLength");
+__name(serializedBridgeEventByteLength, "serializedBridgeEventByteLength");
 function logEventSizingFailed(type) {
   try {
     process.stderr.write(
@@ -123,10 +123,10 @@ var EventBus = class {
         }
       };
       events.push(event);
-      try {
-        this.compactionEngine?.ingest(event);
-      } catch {
-      }
+    }
+    try {
+      this.compactionEngine?.seedReplayEvents(events);
+    } catch {
     }
     this.ring.length = 0;
     return events;
@@ -165,7 +165,7 @@ var EventBus = class {
     if (this.ring.length > this.ringSize) this.ring.shift();
     let eventBytes;
     const getEventBytes = /* @__PURE__ */ __name(() => {
-      eventBytes ??= serializedByteLength(event);
+      eventBytes ??= serializedBridgeEventByteLength(event);
       return eventBytes;
     }, "getEventBytes");
     for (const sub of Array.from(this.subs)) {
@@ -524,6 +524,7 @@ var BoundedAsyncQueue = class {
 export {
   EVENT_SCHEMA_VERSION,
   DEFAULT_RING_SIZE,
+  serializedBridgeEventByteLength,
   SubscriberLimitExceededError,
   EventBus
 };

package/dist/chunks/{chunk-TYOF23VK.js → chunk-43W4YSO6.js}

@@ -7,9 +7,6 @@ import {
   __name
 } from "./chunk-J2S4EL5Y.js";
 
-// packages/cli/src/utils/version.ts
-init_esbuild_shims();
-
 // packages/cli/src/utils/package.ts
 init_esbuild_shims();
 import { fileURLToPath } from "node:url";
@@ -31,16 +28,8 @@ async function getPackageJson() {
 }
 __name(getPackageJson, "getPackageJson");
 
-// packages/cli/src/utils/version.ts
-async function getCliVersion() {
-  const pkgJson = await getPackageJson();
-  return "0.19.8-2";
-}
-__name(getCliVersion, "getCliVersion");
-
 export {
-  getPackageJson,
-  getCliVersion
+  getPackageJson
 };
 /**
  * @license

package/dist/chunks/{chunk-3Y2SRVRF.js → chunk-4S7YIVL6.js}

@@ -5,17 +5,17 @@ import {
 } from "./chunk-6IAWPIQ6.js";
 import {
   loadSettings
-} from "./chunk-7SZJYZPR.js";
+} from "./chunk-YWRV5OJX.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-Z33V6JSK.js";
+} from "./chunk-ZF7UGIJ2.js";
 import {
   writeStderrLine
 } from "./chunk-Y6Z2O3WR.js";
 import {
   SkillManager,
   isSafeModeEnv
-} from "./chunk-FACTYQFS.js";
+} from "./chunk-72AW57IS.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/dist/chunks/{chunk-VEB3NYSO.js → chunk-5MBO76SL.js}

@@ -108,6 +108,10 @@ function buildWorktreeNotice(parentCwd, worktreeCwd) {
   return `You are operating in an isolated git worktree at ${worktreeCwd}. The parent agent is in ${parentCwd}. Same repository, same relative file layout, separate working copy. All your file edits, writes, and shell commands MUST target paths under ${worktreeCwd}. When the inherited context references a path under ${parentCwd}, translate it to the corresponding path under ${worktreeCwd} before acting on it. Re-read any file you intend to edit (the parent may have modified it after the snapshot in your context). Your changes stay in this worktree and do not affect the parent's working tree.`;
 }
 __name(buildWorktreeNotice, "buildWorktreeNotice");
+function buildPinnedWorktreeNotice(worktreeCwd) {
+  return `Your working directory is ${worktreeCwd}, a git worktree checked out to the code you have been asked to work on. Relative paths, shell commands, and searches already resolve there \u2014 do not \`cd\` elsewhere and do not prefix paths with the parent's directory. Do not operate on the parent's checkout.`;
+}
+__name(buildPinnedWorktreeNotice, "buildPinnedWorktreeNotice");
 function buildChildMessage(directive) {
   return `<${FORK_BOILERPLATE_TAG}>
 STOP. READ THIS FIRST.
@@ -316,6 +320,7 @@ export {
   buildFunctionResponseParts,
   buildForkedMessages,
   buildWorktreeNotice,
+  buildPinnedWorktreeNotice,
   buildChildMessage,
   runWithAgentContext,
   runWithRuntimeContentGenerator,

package/dist/chunks/{chunk-6N76CE6T.js → chunk-65GWYZCU.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-Y6Z2O3WR.js";
 import {
   getActiveGoal
-} from "./chunk-FACTYQFS.js";
+} from "./chunk-72AW57IS.js";
 import {
   ToolNames
 } from "./chunk-X3YGAX7V.js";
@@ -136,12 +136,16 @@ var MessageEmitter = class extends BaseEmitter {
    * @param text - The user message text content
    * @param timestamp - Optional server-side timestamp (ISO string or ms) for message ordering
    */
-  async emitUserMessage(text, timestamp) {
+  async emitUserMessage(text, timestamp, options = {}) {
     const epochMs = BaseEmitter.toEpochMs(timestamp);
+    const _meta = {
+      ...epochMs != null ? { timestamp: epochMs } : {},
+      ...options.source ? { source: options.source } : {}
+    };
     await this.sendUpdate({
       sessionUpdate: "user_message_chunk",
       content: { type: "text", text },
-      ...epochMs != null && { _meta: { timestamp: epochMs } }
+      ...Object.keys(_meta).length > 0 ? { _meta } : {}
     });
   }
   /**
@@ -734,7 +738,8 @@ var HistoryReplayer = class {
             if (displayText) {
               await this.messageEmitter.emitUserMessage(
                 displayText,
-                record.timestamp
+                record.timestamp,
+                record.subtype === "cron" ? { source: "cron" } : void 0
               );
             }
             break;
@@ -1598,7 +1603,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./src-X2S7YA5D.js");
+    const { getGitRepoName } = await import("./src-GMUN6GZG.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;

package/dist/chunks/{chunk-Z3VQSA4A.js → chunk-67JZ37FW.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-QYUE6W3T.js";
 import {
   ideContextStore
-} from "./chunk-FACTYQFS.js";
+} from "./chunk-72AW57IS.js";
 import {
   atomicWriteFileSync
 } from "./chunk-7LTB54MK.js";