@alan-ai-hq/agent-manager-darwin-arm64 0.1.138 → 0.1.139

package/alan-agent.cjs

@@ -20782,7 +20782,11 @@ var init_github_proxy = __esm({
     ];
     gitHubProxyUpstreamSchema = external_exports.enum(GITHUB_PROXY_UPSTREAMS);
     GITHUB_PROXY_PLACEHOLDER_TOKEN = "proxy-injected";
-    GITHUB_PROXY_REFUSAL_CODES = ["host_not_proxied", "machine_not_allowed"];
+    GITHUB_PROXY_REFUSAL_CODES = [
+      "host_not_proxied",
+      "machine_not_allowed",
+      "github_not_connected"
+    ];
     gitHubProxyErrorSchema = external_exports.object({
       message: external_exports.string().min(1),
       documentation_url: external_exports.string(),
@@ -24779,12 +24783,58 @@ function conversationTurnView(ordinal, state, previousDisplay = []) {
     read: prepareConversationTurnRead(state)
   };
 }
+function diffArray(previous, next) {
+  const changes = [];
+  for (const [index, value2] of next.entries()) {
+    if (previous[index] !== value2)
+      changes.push({ index, value: value2 });
+  }
+  return { length: next.length, changes };
+}
+function stateFields(state) {
+  const { entries: _entries, unknown: _unknown2, presentation: _presentation, ...fields } = state;
+  return fields;
+}
+function diffTranscriptState(previous, next) {
+  return {
+    entries: diffArray(previous.entries, next.entries),
+    unknown: diffArray(previous.unknown, next.unknown),
+    fields: stateFields(next)
+  };
+}
+function createLiveTurnFrameEncoder() {
+  const sent = /* @__PURE__ */ new Map();
+  return (ordinal, state) => {
+    const previous = sent.get(ordinal);
+    sent.delete(ordinal);
+    sent.set(ordinal, state);
+    for (const oldest of sent.keys()) {
+      if (sent.size <= SENT_LIVE_TURNS)
+        break;
+      sent.delete(oldest);
+    }
+    return previous ? { kind: "patch", ordinal, patch: diffTranscriptState(previous, state) } : { kind: "snapshot", ordinal, state };
+  };
+}
 function isRecord8(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2);
 }
 function isTranscriptState(value2) {
   return isRecord8(value2) && typeof value2.state === "string" && Array.isArray(value2.entries) && Array.isArray(value2.notices) && Array.isArray(value2.unknown);
 }
+function isArrayPatch(value2) {
+  return isRecord8(value2) && Number.isSafeInteger(value2.length) && Array.isArray(value2.changes) && value2.changes.every((change) => isRecord8(change) && Number.isSafeInteger(change.index) && "value" in change);
+}
+function isTranscriptStatePatch(value2) {
+  return isRecord8(value2) && isArrayPatch(value2.entries) && isArrayPatch(value2.unknown) && isRecord8(value2.fields) && typeof value2.fields.state === "string" && Array.isArray(value2.fields.notices);
+}
+function isLiveTurnFrame(value2) {
+  if (!isRecord8(value2) || !Number.isSafeInteger(value2.ordinal))
+    return false;
+  if (value2.kind === "snapshot")
+    return isTranscriptState(value2.state);
+  return value2.kind === "patch" && isTranscriptStatePatch(value2.patch);
+}
 function isPendingAsk(value2) {
   return value2 === null || isRecord8(value2) && typeof value2.toolCallId === "string" && isRecord8(value2.rawInput) && Array.isArray(value2.questions) && value2.questions.every((question) => isRecord8(question) && typeof question.question === "string" && (question.header === void 0 || typeof question.header === "string") && typeof question.multiSelect === "boolean" && Array.isArray(question.options) && question.options.every((option2) => isRecord8(option2) && typeof option2.label === "string" && (option2.description === void 0 || typeof option2.description === "string")));
 }
@@ -24800,6 +24850,7 @@ function isConversationMessageTurn(value2) {
 function isConversationMessagesPage(value2) {
   return isRecord8(value2) && typeof value2.revision === "string" && typeof value2.streamCursor === "string" && (value2.before === null || typeof value2.before === "string") && Array.isArray(value2.turns) && value2.turns.every(isConversationMessageTurn);
 }
+var LIVE_TURN_FRAMES, LIVE_TURN_EVENT, SENT_LIVE_TURNS;
 var init_conversation_messages = __esm({
   "../shared/dist/agent/acp/conversation-messages.js"() {
     "use strict";
@@ -24810,6 +24861,9 @@ var init_conversation_messages = __esm({
     init_prepare_conversation_turns();
     init_reduce();
     init_transcript_http();
+    LIVE_TURN_FRAMES = "patch";
+    LIVE_TURN_EVENT = "live_turn";
+    SENT_LIVE_TURNS = 8;
   }
 });
 
@@ -24835,15 +24889,6 @@ var init_transcript_byte_decoder = __esm({
 });
 
 // ../shared/dist/agent/acp/transcript-fold.js
-function snapshotTranscriptState(state) {
-  return {
-    ...state,
-    entries: state.entries.map((entry) => entry.kind === "message" ? { ...entry, content: [...entry.content] } : { ...entry, content: [...entry.content], locations: [...entry.locations] }),
-    notices: [...state.notices],
-    unknown: [...state.unknown],
-    ...state.activities ? { activities: state.activities.map((activity) => ({ ...activity })) } : {}
-  };
-}
 function isRecord9(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2);
 }
@@ -24884,9 +24929,130 @@ function scopeTranscriptEvent(value2) {
     scoped.content = scopedContent(update.content, turnId);
   return { ...event, update: scoped };
 }
+function placeMessage(cache2, message2, updateOffset, entryOffset, startsWithPrompt) {
+  const cached2 = cache2.get(message2.messageId);
+  const source = message2.state;
+  const sameSource = cached2?.source === source;
+  if (sameSource && cached2.updateCount === source.updateCount && cached2.updateOffset === updateOffset && cached2.entryOffset === entryOffset && cached2.startsWithPrompt === startsWithPrompt)
+    return cached2.state;
+  const replacedEntries = cached2 && !sameSource ? cached2.source.entries : void 0;
+  const entries = source.entries.map((entry, index) => {
+    const previous = cached2?.state.entries[index];
+    const lastUpdateIndex = entry.lastUpdateIndex === void 0 ? void 0 : entry.lastUpdateIndex + updateOffset;
+    if (previous && cached2.updateOffset === updateOffset && previous.id === entry.id && previous.kind === entry.kind && (sameSource ? entry.lastUpdateIndex !== void 0 && previous.lastUpdateIndex === lastUpdateIndex : replacedEntries?.[index] === entry))
+      return previous;
+    return entry.kind === "message" ? { ...entry, lastUpdateIndex, content: [...entry.content] } : {
+      ...entry,
+      lastUpdateIndex,
+      content: [...entry.content],
+      locations: [...entry.locations]
+    };
+  });
+  const state = {
+    ...source,
+    entries,
+    notices: [...source.notices],
+    unknown: [...source.unknown],
+    ...source.activities ? {
+      activities: source.activities.map((activity) => ({
+        ...activity,
+        firstEntryIndex: entryOffset + activity.firstEntryIndex - (startsWithPrompt && activity.firstEntryIndex === 0 ? 1 : 0)
+      }))
+    } : {}
+  };
+  cache2.set(message2.messageId, {
+    source,
+    updateCount: source.updateCount,
+    updateOffset,
+    entryOffset,
+    startsWithPrompt,
+    state
+  });
+  return state;
+}
+function anchoredUpdateOffset(ordered, cache2) {
+  let natural = 0;
+  for (const message2 of ordered) {
+    const placed = cache2.get(message2.messageId);
+    if (placed)
+      return natural - placed.updateOffset;
+    natural += message2.state.updateCount ?? 0;
+  }
+  return 0;
+}
+function mergeTranscriptMessages(messages, cache2) {
+  const merged = emptyTranscript();
+  const ordered = [...messages].sort((left, right) => (left.turnOrdinal ?? 0) - (right.turnOrdinal ?? 0) || left.messageId.localeCompare(right.messageId));
+  let updateOffset = -anchoredUpdateOffset(ordered, cache2);
+  const seenToolIds = /* @__PURE__ */ new Set();
+  const seenNotices = /* @__PURE__ */ new Set();
+  for (const message2 of ordered) {
+    const entryOffset = merged.entries.length;
+    const previous = merged.entries.at(-1);
+    const startsWithPrompt = message2.role !== "user" && previous?.kind === "message" && previous.role === "user";
+    const state = placeMessage(cache2, message2, updateOffset, entryOffset, startsWithPrompt);
+    const removedBefore = [0];
+    const duplicateToolIds = /* @__PURE__ */ new Set();
+    for (const entry of state.entries) {
+      const parentId = entry._meta?.["alan.dev/parentToolCallId"];
+      const rawId = entry._meta?.[TRANSCRIPT_TOOL_RESPONSE_ID_META];
+      const providerEvent = entry._meta?.["alan.dev/providerEvent"];
+      const providerEventId = providerEvent && typeof providerEvent === "object" && "id" in providerEvent ? providerEvent.id : void 0;
+      const toolId = entry.kind === "tool_call" && typeof rawId === "string" && typeof providerEventId === "string" ? `${rawId}:${providerEventId}` : void 0;
+      const duplicate = toolId !== void 0 && seenToolIds.has(toolId) || typeof parentId === "string" && duplicateToolIds.has(parentId);
+      if (!duplicate) {
+        merged.entries.push(entry);
+        if (toolId)
+          seenToolIds.add(toolId);
+      }
+      if (duplicate && toolId)
+        duplicateToolIds.add(entry.id);
+      removedBefore.push((removedBefore.at(-1) ?? 0) + Number(duplicate));
+    }
+    if (state.activities?.length) {
+      merged.activities ??= [];
+      merged.activities.push(...state.activities.map((activity, index) => ({
+        ...activity,
+        firstEntryIndex: activity.firstEntryIndex - (removedBefore[message2.state.activities?.[index]?.firstEntryIndex ?? 0] ?? 0)
+      })));
+    }
+    for (const notice2 of state.notices) {
+      const key = JSON.stringify([notice2.level, notice2.message]);
+      if (seenNotices.has(key))
+        continue;
+      seenNotices.add(key);
+      merged.notices.push({
+        ...notice2,
+        firstEntryIndex: startsWithPrompt ? entryOffset - 1 : entryOffset
+      });
+    }
+    merged.unknown.push(...state.unknown);
+    if (state.userMessageAt !== void 0)
+      merged.userMessageAt = Math.max(merged.userMessageAt ?? state.userMessageAt, state.userMessageAt);
+    if (message2.role !== "user") {
+      merged.state = state.state;
+      merged.stopReason = state.stopReason;
+      merged.thinkingTokens = state.thinkingTokens;
+      if (state.awaitingToolCallIds)
+        merged.awaitingToolCallIds = state.awaitingToolCallIds;
+      else
+        delete merged.awaitingToolCallIds;
+    }
+    if (state.plan)
+      merged.plan = state.plan;
+    if (state.usage)
+      merged.usage = state.usage;
+    if (state.title)
+      merged.title = state.title;
+    updateOffset += state.updateCount ?? 0;
+  }
+  merged.updateCount = updateOffset;
+  return merged;
+}
 var init_transcript_fold = __esm({
   "../shared/dist/agent/acp/transcript-fold.js"() {
     "use strict";
+    init_reduce();
     init_transcript_http();
     init_types2();
   }
@@ -27985,6 +28151,9 @@ function classifyResultError(event, context) {
   if (classified.errorKind !== "unknown_cli_error" || !isApiError) return classified;
   return { ...specForErrorKind("provider_error"), message: classified.message };
 }
+function isIdleUpdate(update) {
+  return isUpdate(update, "state_update") && update.state === "idle";
+}
 function isSettled22(update) {
   return update.status === "completed" || update.status === "failed" || update.status === "cancelled";
 }
@@ -28721,6 +28890,7 @@ var init_claude = __esm({
       #failure;
       #authFailure;
       #resultSeen = false;
+      #heldIdle;
       constructor(options = {}) {
         this.#options = options;
         this.taskRecords = options.taskRecords ?? new TaskRecords(options.now ?? (() => systemClock2.now()));
@@ -28768,7 +28938,17 @@ var init_claude = __esm({
       readEvent(event) {
         const parsed = this.#revise(parseClaudeEvent(event, this.grammar), event);
         parsed.push(...this.#handle(event));
-        const updates = parsed.map((update) => this.taskRecords.stamp(update));
+        const kept = parsed.filter((update) => {
+          if (!isIdleUpdate(update)) return true;
+          if (this.#finalized) return true;
+          this.#heldIdle = update;
+          return false;
+        });
+        if (this.#finalized && this.#heldIdle !== void 0) {
+          if (!kept.some(isIdleUpdate)) kept.push(this.#heldIdle);
+          this.#heldIdle = void 0;
+        }
+        const updates = kept.map((update) => this.taskRecords.stamp(update));
         for (const update of updates) this.#applyRunState(update);
         return updates;
       }
@@ -44092,15 +44272,16 @@ function createPersistentDriver(provider4, options) {
     return void 0;
   };
   const resumeNotice = (spec, session, sink) => {
+    if (spec.resumeFallbackContext) {
+      log.info("holder.session_resume_fallback", { harness: provider4.harness, runId: spec.runId });
+      return { session, contextPrefix: spec.resumeFallbackContext };
+    }
     sink.onEvent({
       seq: 0,
       at: clock.now(),
       update: noticeUpdate("warning", "session_resume_failed", RESUME_UNAVAILABLE)
     });
-    return {
-      session,
-      ...spec.resumeFallbackContext ? { contextPrefix: spec.resumeFallbackContext } : {}
-    };
+    return { session };
   };
   const managedMcpAccess = async (signal) => {
     const managed = options.managedMcp;
@@ -44175,6 +44356,7 @@ function createPersistentDriver(provider4, options) {
       };
       const _events = __using(_stack, session.onEvent(forward));
       live.turn = turn;
+      record2({ sessionUpdate: "state_update", state: "running" });
       if (session.pid !== void 0) sink.onSpawned(session.pid);
       const onAbort = () => {
         void session.cancel();
@@ -46106,7 +46288,7 @@ function createAlanCodeHolderDriver(options) {
       open: open6,
       turnInput: async (spec, inputs, contextPrefix) => openCodeTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -47122,7 +47304,7 @@ function createDroidHolderDriver(options) {
       },
       turnInput: (spec, inputs, contextPrefix) => droidTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -47170,7 +47352,7 @@ function createOpenCodeHolderDriver(options) {
       },
       turnInput: async (spec, inputs, contextPrefix) => openCodeTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -53929,7 +54111,7 @@ var require_websocket_server = __commonJS({
 // package.json
 var package_default = {
   name: "@alan-ai-hq/agent-manager",
-  version: "0.1.138",
+  version: "0.1.139",
   private: true,
   type: "module",
   description: "Alan machine runtime (alan-agent): identity, link, reconciler, session holders, run log, uploader, local API",
@@ -54823,7 +55005,8 @@ var openTurnResponseSchema = external_exports.object({
   runId: external_exports.string().min(1),
   userMessageId: external_exports.string().min(1),
   assistantMessageId: external_exports.string().min(1),
-  created: external_exports.boolean()
+  created: external_exports.boolean(),
+  turnOrdinals: external_exports.object({ user: external_exports.number().int().nonnegative(), assistant: external_exports.number().int().nonnegative() }).optional()
 });
 var errorBodySchema2 = external_exports.object({ code: external_exports.string() });
 function createNativeSessionsClient({
@@ -61599,9 +61782,23 @@ async function ingestTurn(ctx, worker, entry, turn) {
       },
       ctx.shutdown
     );
+    const ordinals = opened.turnOrdinals;
     await ctx.publisher.publish({
       runId: opened.runId,
       conversationId: entry.conversationId,
+      ...ordinals ? {
+        userMessage: {
+          id: opened.userMessageId,
+          content: userMessage,
+          turnOrdinal: ordinals.user,
+          createdAt: startedAt
+        },
+        assistantMessage: {
+          id: opened.assistantMessageId,
+          turnOrdinal: ordinals.assistant,
+          createdAt: startedAt
+        }
+      } : {},
       records: nativeTurnRecords({
         updates: withTerminalIdle(turn.updates, startedAt),
         startedAt,
@@ -65942,14 +66139,18 @@ function applyField(pending, line) {
 }
 async function* readServerSentEvents(body) {
   const decoder3 = new TextDecoder();
-  let buffer = "";
+  let partial2 = [];
   let pending = emptyEvent();
   for await (const chunk of body) {
-    buffer += decoder3.decode(chunk, { stream: true });
-    let newline = buffer.indexOf("\n");
+    const text2 = decoder3.decode(chunk, { stream: true });
+    let start = 0;
+    let newline = text2.indexOf("\n");
     while (newline !== -1) {
-      const line = buffer.slice(0, newline).replace(/\r$/, "");
-      buffer = buffer.slice(newline + 1);
+      partial2.push(text2.slice(start, newline));
+      const line = partial2.join("").replace(/\r$/, "");
+      partial2 = [];
+      start = newline + 1;
+      newline = text2.indexOf("\n", start);
       if (line.length === 0) {
         if (pending.data.length > 0) {
           yield { event: pending.event, id: pending.id, data: pending.data.join("\n") };
@@ -65958,8 +66159,8 @@ async function* readServerSentEvents(body) {
       } else if (!line.startsWith(":")) {
         applyField(pending, line);
       }
-      newline = buffer.indexOf("\n");
     }
+    if (start < text2.length) partial2.push(text2.slice(start));
   }
 }
 
@@ -65996,6 +66197,23 @@ async function readDiscovery(path4) {
   }
   return parsed.data;
 }
+function conversationQuery(query) {
+  return {
+    limit: String(query.limit),
+    ...query.before ? { before: query.before } : {},
+    ...query.runtimeId ? { runtimeId: query.runtimeId } : {}
+  };
+}
+function conversationUpdate(event) {
+  const value2 = JSON.parse(event.data);
+  if (event.event === "snapshot" && isConversationMessagesPage(value2))
+    return { kind: "snapshot", page: value2 };
+  if (event.event === "turn" && isConversationMessageTurn(value2))
+    return { kind: "turn", turn: value2 };
+  if (event.event === LIVE_TURN_EVENT && isLiveTurnFrame(value2))
+    return { kind: "live_turn", frame: value2 };
+  throw new RuntimeClientError("protocol", "Invalid local conversation update");
+}
 function parseWith(schema, raw, what) {
   const parsed = schema.safeParse(raw);
   if (!parsed.success) {
@@ -66141,24 +66359,17 @@ function createRuntimeClient(options) {
     throw new RuntimeClientError("unavailable", "The run log stream closed before the run ended");
   }
   const runs = async (signal) => (await json2({ path: LOCAL_API_ROUTES.runs }, runsResponseSchema, signal)).runs;
-  async function* followConversationMessages(conversationId, limit, signal) {
+  async function* followConversationMessages(query, signal) {
     const stopped = new AbortController();
     try {
       const body = await openStream(
         {
-          path: `/v2/conversations/${encodeURIComponent(conversationId)}/messages/sse`,
-          query: { limit: String(limit) }
+          path: `/v2/conversations/${encodeURIComponent(query.conversationId)}/messages/sse`,
+          query: { ...conversationQuery(query), frames: LIVE_TURN_FRAMES }
         },
         AbortSignal.any([signal, stopped.signal])
       );
-      for await (const event of readServerSentEvents(body)) {
-        const value2 = JSON.parse(event.data);
-        if (event.event === "snapshot" && isConversationMessagesPage(value2))
-          yield { kind: "snapshot", page: value2 };
-        else if (event.event === "turn" && isConversationMessageTurn(value2))
-          yield { kind: "turn", turn: value2 };
-        else throw new RuntimeClientError("protocol", "Invalid local conversation update");
-      }
+      for await (const event of readServerSentEvents(body)) yield conversationUpdate(event);
       if (!signal.aborted)
         throw new RuntimeClientError("unavailable", "The local conversation stream closed");
     } finally {
@@ -66171,11 +66382,11 @@ function createRuntimeClient(options) {
     followConversationMessages,
     runs,
     conversationRuns: async (conversationId, signal) => (await runs(signal)).filter((run2) => run2.conversationId === conversationId),
-    readConversationMessages: async (conversationId, limit, before, signal) => {
+    readConversationMessages: async (query, signal) => {
       const response = await send2(
         {
-          path: `/v2/conversations/${encodeURIComponent(conversationId)}/messages`,
-          query: { limit: String(limit), ...before === null ? {} : { before } }
+          path: `/v2/conversations/${encodeURIComponent(query.conversationId)}/messages`,
+          query: conversationQuery(query)
         },
         signal
       );
@@ -67616,6 +67827,8 @@ var indexRecordSchema = external_exports.object({
   runId: runIdSchema
 });
 var coverageSchema = external_exports.object({
+  // Files written before ranges could start mid-conversation always started at turn 0.
+  lowestOrdinal: external_exports.number().int().nonnegative().default(0),
   highestOrdinal: external_exports.number().int().nonnegative(),
   nextExpectedOrdinal: external_exports.number().int().positive()
 });
@@ -67638,11 +67851,16 @@ async function indexConversationRun(runsDir, conversationId, ordinal, assistantO
   const coveragePath = (0, import_node_path61.join)((0, import_node_path61.dirname)((0, import_node_path61.dirname)(path4)), "coverage.json");
   const coverage = await readJsonFile(coveragePath, coverageSchema);
   const current = coverage.kind === "ok" ? coverage.value : null;
-  if (ordinal === 0 && current === null || current?.nextExpectedOrdinal === ordinal)
-    await writeJsonFileAtomic(coveragePath, {
-      highestOrdinal: ordinal,
-      nextExpectedOrdinal: nextOrdinal
-    });
+  const next = nextCoverage(current, ordinal, nextOrdinal);
+  if (next) await writeJsonFileAtomic(coveragePath, next);
+}
+function nextCoverage(current, ordinal, nextOrdinal) {
+  if (current === null || ordinal > current.nextExpectedOrdinal)
+    return { lowestOrdinal: ordinal, highestOrdinal: ordinal, nextExpectedOrdinal: nextOrdinal };
+  if (ordinal === current.nextExpectedOrdinal)
+    return { ...current, highestOrdinal: ordinal, nextExpectedOrdinal: nextOrdinal };
+  if (ordinal === current.highestOrdinal) return { ...current, nextExpectedOrdinal: nextOrdinal };
+  return null;
 }
 async function readConversationIndexCoverage(runsDir, conversationId) {
   const path4 = (0, import_node_path61.join)((0, import_node_path61.dirname)(indexDirectory(runsDir, conversationId)), "coverage.json");
@@ -71211,22 +71429,34 @@ async function openLocalTurnProjection(runsDir, runId, conversationId, ordinal)
   if (!reader) return null;
   let offset = toByteOffset(0);
   let ended = false;
+  let snapshot2;
   let prepared;
+  const merge2 = /* @__PURE__ */ new Map();
   const decoder3 = new TextDecoder();
+  const readState = async () => {
+    const priorOffset = offset;
+    for (; ; ) {
+      const chunk = await reader.readFrom(offset, DEFAULT_RUN_LOG_LIMIT);
+      if (chunk.bytes.length === 0) break;
+      if (applyLogChunk(decoder3.decode(chunk.bytes), assistantMessageId, state)) ended = true;
+      offset = chunk.to;
+    }
+    if (offset === priorOffset && snapshot2) return snapshot2;
+    if (ended) state.state = "idle";
+    snapshot2 = mergeTranscriptMessages(
+      [{ messageId: assistantMessageId, turnOrdinal: ordinal, role: "assistant", state }],
+      merge2
+    );
+    return snapshot2;
+  };
   return {
     runId,
     ordinal,
+    readState,
     read: async () => {
-      const priorOffset = offset;
-      for (; ; ) {
-        const chunk = await reader.readFrom(offset, DEFAULT_RUN_LOG_LIMIT);
-        if (chunk.bytes.length === 0) break;
-        if (applyLogChunk(decoder3.decode(chunk.bytes), assistantMessageId, state)) ended = true;
-        offset = chunk.to;
-      }
-      if (offset === priorOffset && prepared) return prepared;
-      if (ended) state.state = "idle";
-      prepared = { ...conversationTurnView(ordinal, snapshotTranscriptState(state)), markdown: "" };
+      const current = await readState();
+      if (prepared?.state !== current)
+        prepared = { ...conversationTurnView(ordinal, current, prepared?.display), markdown: "" };
       return prepared;
     },
     [Symbol.asyncDispose]: async () => {
@@ -71247,14 +71477,14 @@ async function projectLocalRun(runsDir, runId, conversationId, ordinal) {
   }
 }
 async function readLocalConversationMessages(runsDir, conversationId, limit, before, projection) {
-  const indexed = await readConversationRunIndex(runsDir, conversationId, before, limit + 1);
   const coverage = await readConversationIndexCoverage(runsDir, conversationId);
-  if (coverage === null || before === void 0 && indexed[0]?.ordinal !== coverage.highestOrdinal)
-    return null;
+  if (coverage === null || before !== void 0 && before <= coverage.lowestOrdinal) return null;
+  const indexed = (await readConversationRunIndex(runsDir, conversationId, before, limit + 1)).filter((entry) => entry.ordinal >= coverage.lowestOrdinal);
+  if (before === void 0 && indexed[0]?.ordinal !== coverage.highestOrdinal) return null;
   if (before !== void 0 && indexed[0]?.nextOrdinal !== before) return null;
   if (indexed.some((entry, index) => index > 0 && entry.nextOrdinal !== indexed[index - 1].ordinal))
     return null;
-  if (indexed.length < limit && indexed.at(-1)?.ordinal !== 0) return null;
+  if (indexed.length < limit && indexed.at(-1)?.ordinal !== coverage.lowestOrdinal) return null;
   const selected = indexed.slice(0, limit);
   if (selected.length === 0) return null;
   const turns = await Promise.all(
@@ -71273,6 +71503,7 @@ async function readLocalConversationMessages(runsDir, conversationId, limit, bef
 }
 
 // src/local-api/conversation-messages-stream.ts
+init_acp();
 async function readChangedTurn(deps, conversationId, runId, slot) {
   const meta3 = await readRunMeta(runDirectory(deps.runsDir, runId).meta);
   if (meta3?.conversationId !== conversationId || meta3.userMessage?.turnOrdinal == null) return null;
@@ -71286,21 +71517,17 @@ async function readChangedTurn(deps, conversationId, runId, slot) {
     if (latest?.runId !== runId) return null;
   }
   if (slot.current && meta3.userMessage.turnOrdinal < slot.current.ordinal) {
-    var _stack = [];
-    try {
-      const previous = __using(_stack, await openLocalTurnProjection(
-        deps.runsDir,
-        runId,
-        conversationId,
-        meta3.userMessage.turnOrdinal
-      ), true);
-      return previous ? await previous.read() : null;
-    } catch (_) {
-      var _error = _, _hasError = true;
-    } finally {
-      var _promise2 = __callDispose(_stack, _error, _hasError);
-      _promise2 && await _promise2;
-    }
+    const previous = await openLocalTurnProjection(
+      deps.runsDir,
+      runId,
+      conversationId,
+      meta3.userMessage.turnOrdinal
+    );
+    if (!previous) return null;
+    return {
+      projection: previous,
+      changed: { ordinal: previous.ordinal, state: await previous.readState() }
+    };
   }
   if (slot.current?.runId !== runId) {
     const next = await openLocalTurnProjection(
@@ -71313,20 +71540,48 @@ async function readChangedTurn(deps, conversationId, runId, slot) {
     slot.current = next;
   }
   if (!slot.current) throw new Error("Local transcript metadata is incomplete");
-  return slot.current.read();
+  return {
+    projection: slot.current,
+    changed: { ordinal: slot.current.ordinal, state: await slot.current.readState() }
+  };
 }
-async function streamLocalConversationMessages(deps, conversationId, limit, res, signal) {
+async function nextChangedRuns(bell, signal) {
+  if (bell.pending.size === 0) {
+    await new Promise((resolve12) => {
+      bell.wake = resolve12;
+      if (signal.aborted || bell.pending.size > 0) resolve12();
+    });
+    bell.wake = void 0;
+  }
+  if (signal.aborted) return [];
+  await systemClock.sleep(50, signal);
+  const changed = [...bell.pending];
+  bell.pending.clear();
+  return changed;
+}
+async function writeChangedTurn(writer, runId, read) {
+  const { ordinal, state } = read.changed;
+  if (state === writer.lastState) return;
+  writer.lastState = state;
+  const patch = writer.frames === "patch";
+  const data = patch ? JSON.stringify(writer.encode(ordinal, state)) : JSON.stringify(await read.projection.read());
+  await writeEvent(writer.res, {
+    name: patch ? LIVE_TURN_EVENT : "turn",
+    id: `${runId}`,
+    dataLines: [data]
+  });
+}
+async function streamLocalConversationMessages(deps, conversationId, limit, frames, res, signal) {
   var _stack = [];
   try {
-    const pending = /* @__PURE__ */ new Set();
-    let wake;
+    const bell = { pending: /* @__PURE__ */ new Set(), wake: void 0 };
     const slot = { current: null };
     const _subscription = __using(_stack, deps.appends.subscribe((runId) => {
       const changed = runId ?? slot.current?.runId;
-      if (changed) pending.add(changed);
-      wake?.();
+      if (changed) bell.pending.add(changed);
+      bell.wake?.();
     }));
-    signal.addEventListener("abort", () => wake?.(), { once: true });
+    signal.addEventListener("abort", () => bell.wake?.(), { once: true });
     try {
       const [newest] = await readConversationRunIndex(deps.runsDir, conversationId, void 0, 1);
       if (newest)
@@ -71336,7 +71591,12 @@ async function streamLocalConversationMessages(deps, conversationId, limit, res,
           conversationId,
           newest.ordinal
         );
-      let lastTurn = await slot.current?.read();
+      const writer = {
+        frames,
+        encode: createLiveTurnFrameEncoder(),
+        res,
+        lastState: await slot.current?.readState()
+      };
       const page = await readLocalConversationMessages(
         deps.runsDir,
         conversationId,
@@ -71355,22 +71615,14 @@ async function streamLocalConversationMessages(deps, conversationId, limit, res,
         dataLines: [JSON.stringify(page)]
       });
       while (!signal.aborted) {
-        if (pending.size === 0) {
-          await new Promise((resolve12) => {
-            wake = resolve12;
-            if (signal.aborted || pending.size > 0) resolve12();
-          });
-          wake = void 0;
-        }
-        if (signal.aborted) return;
-        await systemClock.sleep(50, signal);
-        const changed = [...pending];
-        pending.clear();
-        for (const runId of changed) {
-          const turn = await readChangedTurn(deps, conversationId, runId, slot);
-          if (!turn || turn === lastTurn) continue;
-          lastTurn = turn;
-          await writeEvent(res, { name: "turn", id: `${runId}`, dataLines: [JSON.stringify(turn)] });
+        for (const runId of await nextChangedRuns(bell, signal)) {
+          const read = await readChangedTurn(deps, conversationId, runId, slot);
+          if (!read) continue;
+          try {
+            await writeChangedTurn(writer, runId, read);
+          } finally {
+            if (read.projection !== slot.current) await read.projection[Symbol.asyncDispose]();
+          }
         }
       }
     } finally {
@@ -71584,7 +71836,9 @@ var RUN_PATH = /^\/v2\/runs\/([^/]+)\/(log|log\/stream|abort)$/;
 var CONVERSATION_MESSAGES_PATH = /^\/v2\/conversations\/([^/]+)\/messages(\/sse)?$/;
 var conversationMessagesQuerySchema = external_exports.object({
   limit: external_exports.coerce.number().int().min(1).max(100).default(10),
-  before: external_exports.coerce.number().int().nonnegative().optional()
+  before: external_exports.coerce.number().int().nonnegative().optional(),
+  runtimeId: external_exports.string().uuid().optional(),
+  frames: external_exports.enum(["turn", "patch"]).default("turn")
 });
 var emptyBodySchema = external_exports.object({});
 function activeRunIds(runs) {
@@ -71805,6 +72059,44 @@ var FIXED_ROUTES = new Map([
   [LOCAL_API_ROUTES.providerExternal, { method: "POST", handle: providerExternal }],
   ...machineFeatureRoutes
 ]);
+async function routeConversationMessages(deps, request2, conversationMatch) {
+  if (request2.req.method !== "GET") {
+    sendError(request2.res, 405, "method_not_allowed", "Use GET");
+    return;
+  }
+  const conversationId = conversationIdSchema.safeParse(conversationMatch[1]);
+  const query = conversationMessagesQuerySchema.safeParse(
+    Object.fromEntries(request2.url.searchParams)
+  );
+  if (!conversationId.success || !query.success) {
+    sendError(request2.res, 400, "invalid_request", "Invalid conversation messages request");
+    return;
+  }
+  if (query.data.runtimeId && query.data.runtimeId !== deps.readFacts().machineId) {
+    sendError(request2.res, 404, "not_found", "This conversation runs on another computer");
+    return;
+  }
+  if (conversationMatch[2])
+    return streamLocalConversationMessages(
+      deps,
+      conversationId.data,
+      query.data.limit,
+      query.data.frames,
+      request2.res,
+      request2.signal
+    );
+  const page = await readLocalConversationMessages(
+    deps.runsDir,
+    conversationId.data,
+    query.data.limit,
+    query.data.before
+  );
+  if (page === null) {
+    sendError(request2.res, 404, "not_found", "This computer has no complete local page");
+    return;
+  }
+  sendJson(request2.res, 200, page);
+}
 async function routeRun(deps, request2, match) {
   const runId = runIdSchema.safeParse(match[1]);
   const action = match[2];
@@ -71833,40 +72125,8 @@ async function route(deps, request2) {
   const match = RUN_PATH.exec(request2.url.pathname);
   if (match !== null) return routeRun(deps, request2, match);
   const conversationMatch = CONVERSATION_MESSAGES_PATH.exec(request2.url.pathname);
-  if (conversationMatch !== null) {
-    if (request2.req.method !== "GET") {
-      sendError(request2.res, 405, "method_not_allowed", "Use GET");
-      return;
-    }
-    const conversationId = conversationIdSchema.safeParse(conversationMatch[1]);
-    const query = conversationMessagesQuerySchema.safeParse(
-      Object.fromEntries(request2.url.searchParams)
-    );
-    if (!conversationId.success || !query.success) {
-      sendError(request2.res, 400, "invalid_request", "Invalid conversation messages request");
-      return;
-    }
-    if (conversationMatch[2])
-      return streamLocalConversationMessages(
-        deps,
-        conversationId.data,
-        query.data.limit,
-        request2.res,
-        request2.signal
-      );
-    const page = await readLocalConversationMessages(
-      deps.runsDir,
-      conversationId.data,
-      query.data.limit,
-      query.data.before
-    );
-    if (page === null) {
-      sendError(request2.res, 404, "not_found", "This computer has no complete local page");
-      return;
-    }
-    sendJson(request2.res, 200, page);
-    return;
-  }
+  if (conversationMatch !== null)
+    return routeConversationMessages(deps, request2, conversationMatch);
   sendError(request2.res, 404, "not_found", "Not found");
 }
 
@@ -71974,6 +72234,7 @@ async function serveLocalApi(deps) {
   const appAttachments = createAppAttachments(clock);
   const routeDeps = {
     feed,
+    readFacts: deps.readFacts,
     appAttachments,
     actions: deps.actions,
     runsDir: deps.runsDir,
@@ -76318,12 +76579,15 @@ function startUploader({ api, runsDir, clock, log }) {
     if (stored.kind === "ok") return stored.value;
     const receipt = await api.readReceipt(target, controller.signal);
     switch (receipt.kind) {
-      case "read":
+      case "read": {
         log.debug("upload.resumed", {
           runId,
           admittedOffset: receipt.receipt?.admittedOffset ?? 0
         });
-        return progressFromReceipt(receipt.receipt);
+        const progress = progressFromReceipt(receipt.receipt);
+        if (progress.sealed) await writeJsonFileAtomic(path4, progress);
+        return progress;
+      }
       case "rejected":
         await reject(runId, path4, progressFromReceipt(null), receipt);
         return null;
@@ -76573,6 +76837,28 @@ function unwrap(outcome2, what) {
     outcome2.code
   );
 }
+async function writeNativeTurnRun(runsDir, run2, log) {
+  const runId = runIdSchema.parse(run2.runId);
+  const conversationId = conversationIdSchema.parse(run2.conversationId);
+  const { userMessage, assistantMessage } = run2;
+  await writeCompleteRunLog(
+    runsDir,
+    { runId, conversationId, userMessage, assistantMessage },
+    run2.records
+  );
+  if (userMessage?.turnOrdinal != null && assistantMessage?.turnOrdinal != null) {
+    await indexConversationRun(
+      runsDir,
+      conversationId,
+      userMessage.turnOrdinal,
+      assistantMessage.turnOrdinal,
+      runId
+    ).catch(
+      (error61) => log.warn("native_ingest.conversation_index_failed", { runId, error: error61 })
+    );
+  }
+  return runId;
+}
 async function startMachineNativeIngest(deps) {
   const client = createNativeSessionsClient({
     apiUrl: deps.apiUrl,
@@ -76589,13 +76875,7 @@ async function startMachineNativeIngest(deps) {
     api,
     publisher: {
       publish: async (run2) => {
-        const runId = runIdSchema.parse(run2.runId);
-        await writeCompleteRunLog(
-          deps.runsDir,
-          { runId, conversationId: conversationIdSchema.parse(run2.conversationId) },
-          run2.records
-        );
-        deps.onPublished(runId);
+        deps.onPublished(await writeNativeTurnRun(deps.runsDir, run2, deps.log));
       }
     },
     clock: deps.clock,

package/alan-holder.cjs

@@ -20742,7 +20742,11 @@ var init_github_proxy = __esm({
       "github.com"
     ];
     gitHubProxyUpstreamSchema = external_exports.enum(GITHUB_PROXY_UPSTREAMS);
-    GITHUB_PROXY_REFUSAL_CODES = ["host_not_proxied", "machine_not_allowed"];
+    GITHUB_PROXY_REFUSAL_CODES = [
+      "host_not_proxied",
+      "machine_not_allowed",
+      "github_not_connected"
+    ];
     gitHubProxyErrorSchema = external_exports.object({
       message: external_exports.string().min(1),
       documentation_url: external_exports.string(),
@@ -26664,6 +26668,9 @@ function classifyResultError(event, context) {
   if (classified.errorKind !== "unknown_cli_error" || !isApiError) return classified;
   return { ...specForErrorKind("provider_error"), message: classified.message };
 }
+function isIdleUpdate(update) {
+  return isUpdate(update, "state_update") && update.state === "idle";
+}
 function isSettled2(update) {
   return update.status === "completed" || update.status === "failed" || update.status === "cancelled";
 }
@@ -27206,6 +27213,7 @@ var init_claude = __esm({
       #failure;
       #authFailure;
       #resultSeen = false;
+      #heldIdle;
       constructor(options = {}) {
         this.#options = options;
         this.taskRecords = options.taskRecords ?? new TaskRecords(options.now ?? (() => systemClock2.now()));
@@ -27253,7 +27261,17 @@ var init_claude = __esm({
       readEvent(event) {
         const parsed = this.#revise(parseClaudeEvent(event, this.grammar), event);
         parsed.push(...this.#handle(event));
-        const updates = parsed.map((update) => this.taskRecords.stamp(update));
+        const kept = parsed.filter((update) => {
+          if (!isIdleUpdate(update)) return true;
+          if (this.#finalized) return true;
+          this.#heldIdle = update;
+          return false;
+        });
+        if (this.#finalized && this.#heldIdle !== void 0) {
+          if (!kept.some(isIdleUpdate)) kept.push(this.#heldIdle);
+          this.#heldIdle = void 0;
+        }
+        const updates = kept.map((update) => this.taskRecords.stamp(update));
         for (const update of updates) this.#applyRunState(update);
         return updates;
       }
@@ -39432,15 +39450,16 @@ function createPersistentDriver(provider4, options) {
     return void 0;
   };
   const resumeNotice = (spec, session, sink) => {
+    if (spec.resumeFallbackContext) {
+      log.info("holder.session_resume_fallback", { harness: provider4.harness, runId: spec.runId });
+      return { session, contextPrefix: spec.resumeFallbackContext };
+    }
     sink.onEvent({
       seq: 0,
       at: clock.now(),
       update: noticeUpdate("warning", "session_resume_failed", RESUME_UNAVAILABLE)
     });
-    return {
-      session,
-      ...spec.resumeFallbackContext ? { contextPrefix: spec.resumeFallbackContext } : {}
-    };
+    return { session };
   };
   const managedMcpAccess = async (signal) => {
     const managed = options.managedMcp;
@@ -39515,6 +39534,7 @@ function createPersistentDriver(provider4, options) {
       };
       const _events = __using(_stack, session.onEvent(forward));
       live.turn = turn;
+      record2({ sessionUpdate: "state_update", state: "running" });
       if (session.pid !== void 0) sink.onSpawned(session.pid);
       const onAbort = () => {
         void session.cancel();
@@ -41446,7 +41466,7 @@ function createAlanCodeHolderDriver(options) {
       open: open4,
       turnInput: async (spec, inputs, contextPrefix) => openCodeTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -42462,7 +42482,7 @@ function createDroidHolderDriver(options) {
       },
       turnInput: (spec, inputs, contextPrefix) => droidTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -42510,7 +42530,7 @@ function createOpenCodeHolderDriver(options) {
       },
       turnInput: async (spec, inputs, contextPrefix) => openCodeTurnInput(spec, {
         attachments: inputs.attachments,
-        skills: [],
+        skills: inputs.skills,
         ...contextPrefix === void 0 ? {} : { contextPrefix }
       })
     },
@@ -47699,6 +47719,8 @@ var indexRecordSchema = external_exports.object({
   runId: runIdSchema
 });
 var coverageSchema = external_exports.object({
+  // Files written before ranges could start mid-conversation always started at turn 0.
+  lowestOrdinal: external_exports.number().int().nonnegative().default(0),
   highestOrdinal: external_exports.number().int().nonnegative(),
   nextExpectedOrdinal: external_exports.number().int().positive()
 });
@@ -47721,11 +47743,16 @@ async function indexConversationRun(runsDir, conversationId, ordinal, assistantO
   const coveragePath = (0, import_node_path24.join)((0, import_node_path24.dirname)((0, import_node_path24.dirname)(path)), "coverage.json");
   const coverage = await readJsonFile(coveragePath, coverageSchema);
   const current = coverage.kind === "ok" ? coverage.value : null;
-  if (ordinal === 0 && current === null || current?.nextExpectedOrdinal === ordinal)
-    await writeJsonFileAtomic(coveragePath, {
-      highestOrdinal: ordinal,
-      nextExpectedOrdinal: nextOrdinal
-    });
+  const next = nextCoverage(current, ordinal, nextOrdinal);
+  if (next) await writeJsonFileAtomic(coveragePath, next);
+}
+function nextCoverage(current, ordinal, nextOrdinal) {
+  if (current === null || ordinal > current.nextExpectedOrdinal)
+    return { lowestOrdinal: ordinal, highestOrdinal: ordinal, nextExpectedOrdinal: nextOrdinal };
+  if (ordinal === current.nextExpectedOrdinal)
+    return { ...current, highestOrdinal: ordinal, nextExpectedOrdinal: nextOrdinal };
+  if (ordinal === current.highestOrdinal) return { ...current, nextExpectedOrdinal: nextOrdinal };
+  return null;
 }
 
 // src/run-log/tail.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alan-ai-hq/agent-manager-darwin-arm64",
-  "version": "0.1.138",
+  "version": "0.1.139",
   "description": "Alan machine runtime (alan-agent) for one platform: the official Node.js binary, the runtime bundle and its launcher. Installed by @alan-ai-hq/agent-manager.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://tryalan.ai",