@alan-ai-hq/agent-manager 0.1.115 → 0.1.118

package/dist/index.cjs

@@ -34932,7 +34932,7 @@ function buildComputerReadiness(input2) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.115";
+var AGENT_VERSION = "0.1.118";
 
 // src/daemon/status.ts
 var PENDING_RUN_START_TTL_MS = 10 * 6e4;
@@ -45538,7 +45538,12 @@ function createCliBackend(options) {
     kind: options.kind,
     supportTier: options.supportTier,
     async run(context) {
-      const state = { process: null, iterations: 0, summary: "" };
+      const state = {
+        process: null,
+        iterations: 0,
+        summary: "",
+        runStartedAtMs: Date.now()
+      };
       const prompt = resolvePrompt(options, context);
       const supervisor = new CliProcessSupervisor(options, context, state);
       const observed = await supervisor.run(prompt, resolveArgs(options, context, prompt));
@@ -46991,6 +46996,7 @@ var claudeGrammar = fromJsonGrammar({
   }
 });
 var STREAMED_TEXT_KEY = "claude.streamedTextMessageIds";
+var LAST_FOREGROUND_TEXT_KEY = "claude.lastForegroundText";
 function streamedTextIds(state) {
   const existing = state.scratch[STREAMED_TEXT_KEY];
   if (existing instanceof Set) return existing;
@@ -47074,6 +47080,13 @@ function parseStreamEvent(event, state) {
       const messageId = streamMessageId(event, state);
       streamedTextIds(state).add(messageId);
       state.currentMessageId = messageId;
+      if (!nesting(event)._meta) {
+        const previous = state.scratch[LAST_FOREGROUND_TEXT_KEY];
+        state.scratch[LAST_FOREGROUND_TEXT_KEY] = {
+          messageId,
+          text: (previous?.messageId === messageId ? previous.text : "") + text2
+        };
+      }
       return [
         {
           sessionUpdate: "agent_message_chunk",
@@ -47409,10 +47422,12 @@ function parseResult(event, state) {
   const stopReason = stopReasonFor(asString(event.stop_reason), isError);
   const resultText2 = asString(event.result);
   const updates = [];
-  if (resultText2 && state.currentMessageId) {
+  const streamed2 = state.scratch[LAST_FOREGROUND_TEXT_KEY];
+  const resultMessageId = streamed2?.text === resultText2 ? streamed2.messageId : state.currentMessageId;
+  if (resultText2 && resultMessageId) {
     updates.push({
       sessionUpdate: "agent_message",
-      messageId: state.currentMessageId,
+      messageId: resultMessageId,
       content: [textBlock(resultText2)]
     });
   } else if (resultText2) {
@@ -48219,19 +48234,28 @@ function isUserPromptLine(line) {
   const payload = asObject(parseJsonObject(line)?.payload);
   return payload?.type === "message" && payload.role === "user" && !isSyntheticUserRolloutMessage(payload);
 }
-function linesAfterLatestUserPrompt(logPath) {
+function linesAfterLatestUserPrompt(logPath, runStartedAtMs) {
   const lines = [];
   for (const line of jsonlLinesFromEnd(logPath)) {
-    if (isUserPromptLine(line.text)) break;
+    if (isUserPromptLine(line.text)) {
+      if (!promptBelongsToRun(line.text, runStartedAtMs)) return [];
+      return lines.reverse();
+    }
     lines.push(line.text);
   }
-  return lines.reverse();
+  return runStartedAtMs === void 0 ? lines.reverse() : [];
+}
+function promptBelongsToRun(line, runStartedAtMs) {
+  if (runStartedAtMs === void 0) return true;
+  const timestamp = parseJsonObject(line)?.timestamp;
+  return typeof timestamp === "string" && Date.parse(timestamp) >= runStartedAtMs;
 }
-function latestUserPromptOffset(logPath) {
+function latestUserPromptOffset(logPath, runStartedAtMs) {
   for (const line of jsonlLinesFromEnd(logPath)) {
-    if (isUserPromptLine(line.text)) return line.offset;
+    if (isUserPromptLine(line.text))
+      return promptBelongsToRun(line.text, runStartedAtMs) ? line.offset : null;
   }
-  return 0;
+  return runStartedAtMs === void 0 ? 0 : null;
 }
 function firstUserMessageLineIndex(lines) {
   return lines.findIndex(isUserPromptLine);
@@ -48271,9 +48295,11 @@ var rolloutScans = /* @__PURE__ */ new WeakMap();
 function rolloutScanFor(state, path2) {
   const existing = rolloutScans.get(state);
   if (existing?.path === path2) return existing;
+  const promptOffset = latestUserPromptOffset(path2, state.runStartedAtMs);
+  if (promptOffset === null) return null;
   const scan = {
     path: path2,
-    cursor: new TranscriptCursor(path2, latestUserPromptOffset(path2)),
+    cursor: new TranscriptCursor(path2, promptOffset),
     spawnByCallId: /* @__PURE__ */ new Map(),
     workersByThreadId: /* @__PURE__ */ new Map()
   };
@@ -48352,6 +48378,7 @@ function foldRolloutLine(line, scan) {
 }
 function collectCodexWorkerReplays(logPath, state) {
   const scan = rolloutScanFor(state, logPath);
+  if (!scan) return [];
   for (const line of scan.cursor.read()) foldRolloutLine(line.text, scan);
   scan.cursor.close();
   const unresolved = [...scan.spawnByCallId.values()].filter(
@@ -48641,7 +48668,7 @@ async function replayCodexMcpToolEventsFromSessionLog(context, state) {
   const codexHome = resolveCodexHome(context.env);
   const logPath = findCodexSessionLog(runtimeSessionId, codexHome);
   if (!logPath) return;
-  const lines = linesAfterLatestUserPrompt(logPath);
+  const lines = linesAfterLatestUserPrompt(logPath, state.runStartedAtMs);
   const streamedToolIds = state.codexStreamedToolIds ?? /* @__PURE__ */ new Set();
   const emittedToolIds = /* @__PURE__ */ new Set();
   for (const line of lines) {
@@ -55726,7 +55753,7 @@ function resolveRuntimeCwd(payload) {
 
 // src/daemon/helpers.ts
 var STAGING_API_URL = process.env.ALAN_STAGING_API_URL ?? "https://staging-api.tryalan.ai";
-var STAGING_WS_URL = process.env.ALAN_STAGING_WS_URL ?? "wss://alan-staging-ws.tryalan.ai";
+var STAGING_WS_URL = process.env.ALAN_STAGING_WS_URL ?? "wss://staging-api.tryalan.ai";
 var PRODUCTION_API_URL = "https://api.tryalan.ai";
 var PRODUCTION_WS_URL = "wss://ws.tryalan.ai";
 var LOCAL_API_URL = "http://localhost:8400";
@@ -60697,6 +60724,22 @@ function recoverInterruptedRange(options, conversationId, runId) {
   );
   return recovered;
 }
+function waitUntil(at, signal) {
+  return new Promise((resolve14) => {
+    const done = () => {
+      signal.removeEventListener("abort", done);
+      clearTimeout(timer);
+      resolve14();
+    };
+    const timer = setTimeout(done, Math.max(0, at - Date.now()));
+    signal.addEventListener("abort", done, { once: true });
+  });
+}
+function isDelivered(state) {
+  if (!state || state.endOffset === void 0) return true;
+  const size = state.endOffset - state.startOffset;
+  return state.syncedOffset === size && state.finalizedOffset === size;
+}
 function decodeId(name) {
   try {
     const id = decodeURIComponent(name);
@@ -60772,10 +60815,15 @@ async function replayClosedTranscripts(options) {
         signal: options.signal,
         sandbox: state.sandbox
       };
+      const cooldownUntil = Math.max(state.pushRetryAfter ?? 0, state.liveRetryAfter ?? 0);
       const push2 = startTranscriptPush(target, options.onProblem);
       const live = startTranscriptLive(target, options.onProblem);
       try {
         await Promise.all([push2.flush(), live.flush()]);
+        if (cooldownUntil > Date.now() && !isDelivered(readConversationSyncState(options.configPath, conversationId).runs[runId])) {
+          await waitUntil(cooldownUntil, options.signal);
+          if (!options.signal.aborted) await Promise.all([push2.flush(), live.flush()]);
+        }
       } finally {
         await Promise.all([push2.stop(), live.stop()]);
       }
@@ -61018,6 +61066,8 @@ var RuntimeSkillCoordinator = class {
   }
   async runUnlocked(initialScan, scanRequest) {
     const attemptedDesiredRevisions = /* @__PURE__ */ new Set();
+    const offeredReportIds = /* @__PURE__ */ new Set();
+    const executedCommandIds = /* @__PURE__ */ new Set();
     if (initialScan) {
       this.pendingInventory = await this.scan(initialScan);
     }
@@ -61027,6 +61077,7 @@ var RuntimeSkillCoordinator = class {
         status2.appliedRevision,
         initialScan || this.lastScanInput ? void 0 : scanRequest
       );
+      for (const id of this.pendingReportIds()) offeredReportIds.add(id);
       const response = await this.control.sync(request);
       this.accept(response.acceptedAttemptIds);
       let producedWork = false;
@@ -61036,6 +61087,8 @@ var RuntimeSkillCoordinator = class {
         producedWork = true;
       }
       for (const command of response.commands) {
+        if (executedCommandIds.has(command.commandId)) continue;
+        executedCommandIds.add(command.commandId);
         switch (command.kind) {
           case "scan":
             this.pendingInventory = await this.scan(command.input);
@@ -61077,7 +61130,10 @@ var RuntimeSkillCoordinator = class {
           }
         }
       }
-      if (!producedWork && !this.hasPendingReports()) return;
+      if (!producedWork && !this.hasUnofferedReports(offeredReportIds)) {
+        this.discardRefusedReports(offeredReportIds);
+        return;
+      }
     }
     throw new Error("Skill synchronization did not converge after 10 exchanges");
   }
@@ -61116,10 +61172,37 @@ var RuntimeSkillCoordinator = class {
       if (accepted.has(commandId)) this.completedCommandIds.delete(commandId);
     }
   }
-  hasPendingReports() {
-    return Boolean(
-      this.pendingInventory || this.pendingApplied || this.pendingPublished.size > 0 || this.pendingResolvedConflicts.size > 0 || this.completedCommandIds.size > 0
-    );
+  pendingReportIds() {
+    return [
+      ...this.pendingInventory ? [this.pendingInventory.attemptId] : [],
+      ...this.pendingApplied ? [this.pendingApplied.attemptId] : [],
+      ...this.pendingPublished.keys(),
+      ...this.pendingResolvedConflicts.keys(),
+      ...this.completedCommandIds
+    ];
+  }
+  hasUnofferedReports(offered) {
+    return this.pendingReportIds().some((id) => !offered.has(id));
+  }
+  /**
+   * A report the server saw and declined to acknowledge will never be
+   * acknowledged: previews and conflict resolutions expire server-side, and a
+   * completed command id stops matching once the context revision it was
+   * derived from moves. Keeping them means every later run re-sends a report
+   * the server always ignores. Inventory and applied results are deliberately
+   * exempt — the server acknowledges those unconditionally, so a miss there
+   * means a genuinely new attempt is still owed.
+   */
+  discardRefusedReports(offered) {
+    for (const commandId of [...this.pendingPublished.keys()]) {
+      if (offered.has(commandId)) this.pendingPublished.delete(commandId);
+    }
+    for (const commandId of [...this.pendingResolvedConflicts.keys()]) {
+      if (offered.has(commandId)) this.pendingResolvedConflicts.delete(commandId);
+    }
+    for (const commandId of [...this.completedCommandIds]) {
+      if (offered.has(commandId)) this.completedCommandIds.delete(commandId);
+    }
   }
   async runExclusively(work) {
     const previous = this.tail;
@@ -62593,7 +62676,7 @@ function ensureProviderCliInstalled(backendKind, options) {
 function joinLines(lines) {
   return lines.join("\n");
 }
-function currentUserSection(user) {
+function currentUserSection(user, visibility) {
   if (!user) return null;
   const lines = ["# Current User"];
   if (user.name) lines.push(`- **Name**: ${user.name}`);
@@ -62601,7 +62684,7 @@ function currentUserSection(user) {
   lines.push(`- **User ID**: ${user.id}`);
   lines.push("");
   lines.push(
-    "This is the person who initiated this conversation. When creating tasks or assigning work, default to assigning to this user unless explicitly instructed otherwise."
+    visibility === "team" ? "This session is shared with the team. When creating tasks or assigning work, create them on this team. The person above started the session." : visibility === "private" ? "This session is private to this person. When creating tasks or assigning work, default to assigning to this user unless explicitly instructed otherwise." : "This is the person who initiated this conversation. When creating tasks or assigning work, default to assigning to this user unless explicitly instructed otherwise."
   );
   return joinLines(lines);
 }
@@ -62732,7 +62815,7 @@ function prototypeSection(owner) {
 function buildPromptContext(config4) {
   const owner = resolveRunOwnership(config4);
   return [
-    currentUserSection(config4.currentUser),
+    currentUserSection(config4.currentUser, config4.sessionVisibility),
     taskContextSection(config4.taskMeta),
     pullRequestSection(config4.prMeta),
     artifactIdsSection(owner),
@@ -62952,6 +63035,7 @@ function buildAgentRunConfig(input2) {
     taskId: input2.taskId ?? input2.taskMeta?.id,
     teamId: input2.teamId,
     currentUser: input2.currentUser,
+    sessionVisibility: input2.sessionVisibility,
     workflowTools: input2.workflowTools,
     workflowId: input2.workflowId,
     workflowExecutionId: input2.workflowExecutionId,
@@ -63674,6 +63758,7 @@ async function launchRun(ctx, payload, plan) {
       taskId: payload.taskId,
       teamId: payload.teamId,
       currentUser: payload.currentUser,
+      sessionVisibility: payload.sessionVisibility,
       workflowTools: payload.workflowTools,
       workflowId: payload.workflowId,
       workflowExecutionId: payload.workflowExecutionId,
@@ -69512,6 +69597,7 @@ var WSClient = class {
       conversationId: data.conversationId,
       teamId: data.teamId,
       currentUser: data.currentUser,
+      sessionVisibility: data.sessionVisibility,
       terminalContextRefs: data.terminalContextRefs,
       terminalSnapshots: data.terminalSnapshots,
       externalMcpServers: data.externalMcpServers
@@ -70126,6 +70212,7 @@ function initialTurn(seed) {
     cloudEnvironmentId: void 0,
     teamId: seed.teamId,
     currentUser: seed.currentUser,
+    sessionVisibility: seed.sessionVisibility,
     terminalContextRefs: void 0,
     terminalSnapshots: void 0
   };
@@ -70172,6 +70259,7 @@ function applyUserMessage(turn, patch) {
     taskId: kept(patch.taskId, turn.taskId),
     conversationId: kept(patch.conversationId, turn.conversationId),
     currentUser: kept(patch.currentUser, turn.currentUser),
+    sessionVisibility: kept(patch.sessionVisibility, turn.sessionVisibility),
     teamId: kept(patch.teamId, turn.teamId),
     terminalContextRefs: kept(patch.terminalContextRefs, turn.terminalContextRefs),
     terminalSnapshots: kept(patch.terminalSnapshots, turn.terminalSnapshots)
@@ -70489,6 +70577,7 @@ async function runSandbox(config4) {
               taskId: turn.taskId,
               teamId: turn.teamId,
               currentUser: turn.currentUser,
+              sessionVisibility: turn.sessionVisibility,
               workflowTools: turn.workflowTools,
               workflowId,
               workflowExecutionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alan-ai-hq/agent-manager",
-  "version": "0.1.115",
+  "version": "0.1.118",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
   "description": "Alan agent runtime — cloud sandbox and local daemon (alan-agent CLI)",
@@ -27,9 +27,9 @@
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
     "typescript": "~5.9.3",
+    "@alan-ai/sandbox-runtime-spec": "0.1.0",
     "@alan-ai/agent-core": "0.1.0",
-    "@alan-ai/shared": "0.1.0",
-    "@alan-ai/sandbox-runtime-spec": "0.1.0"
+    "@alan-ai/shared": "0.1.0"
   },
   "scripts": {
     "build": "tsup",

package/dist/__tests__/binding-switch-git.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=binding-switch-git.test.d.ts.map

package/dist/__tests__/binding-switch-git.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"binding-switch-git.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/binding-switch-git.test.ts"],"names":[],"mappings":""}