adhdev 0.9.54 → 0.9.56

package/dist/cli/index.js

@@ -1483,7 +1483,12 @@ function createDefaultGitCommandServices() {
       turnId
     }),
     compareSnapshots: ({ beforeSnapshotId, afterSnapshotId }) => defaultSnapshotStore.compare(beforeSnapshotId, afterSnapshotId),
-    getLog: ({ workspace, limit, path: filePath, since, until }) => getGitLog(workspace, { limit, path: filePath, since, until })
+    getLog: ({ workspace, limit, path: filePath, since, until }) => getGitLog(workspace, { limit, path: filePath, since, until }),
+    checkpoint: async ({ workspace, message, includeUntracked = false }) => gitCheckpoint(workspace, message, includeUntracked),
+    stashPush: async ({ workspace, message, includeUntracked = false }) => gitStashPush(workspace, message, includeUntracked),
+    stashPop: async ({ workspace, stashRef }) => gitStashPop(workspace, stashRef),
+    checkoutFiles: async ({ workspace, paths }) => gitCheckoutFiles(workspace, paths),
+    getRemoteUrl: async ({ workspace, remote = "origin" }) => gitGetRemoteUrl(workspace, remote)
   };
 }
 function validateWorkspace2(args) {
@@ -1546,9 +1551,6 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
   if (!isGitCommandName(command)) {
     return failure("invalid_args", `Unknown Git command: ${command}`);
   }
-  if (MUTATING_COMMAND_NAMES.has(command)) {
-    return failure("invalid_args", `${command} is not implemented in daemon-core read-only Git routing`);
-  }
   const workspaceResult = validateWorkspace2(args);
   if ("success" in workspaceResult) return workspaceResult;
   const { workspace } = workspaceResult;
@@ -1608,10 +1610,153 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
       }));
       return "success" in log2 ? log2 : { success: true, log: log2 };
     }
+    case "git_checkpoint": {
+      if (!services.checkpoint) return serviceNotImplemented(command);
+      const msg = validateMutatingMessage(args?.message);
+      if (typeof msg !== "string") return msg;
+      const includeUntracked = Boolean(args?.includeUntracked);
+      const checkpoint = await runService(() => services.checkpoint({ workspace, message: msg, includeUntracked }));
+      return "success" in checkpoint ? checkpoint : { success: true, checkpoint };
+    }
+    case "git_stash_push": {
+      if (!services.stashPush) return serviceNotImplemented(command);
+      const msg = validateMutatingMessage(args?.message);
+      if (typeof msg !== "string") return msg;
+      const includeUntracked = Boolean(args?.includeUntracked);
+      const stash = await runService(() => services.stashPush({ workspace, message: msg, includeUntracked }));
+      return "success" in stash ? stash : { success: true, stash };
+    }
+    case "git_stash_pop": {
+      if (!services.stashPop) return serviceNotImplemented(command);
+      const stashRef = optionalString(args?.stashRef);
+      if (stashRef !== void 0 && !/^stash@\{\d+\}$/.test(stashRef)) {
+        return failure("invalid_args", "stashRef must match stash@{N} format");
+      }
+      const popResult = await runService(() => services.stashPop({ workspace, stashRef }));
+      if (popResult !== void 0 && "success" in popResult) return popResult;
+      return { success: true, stashPopped: true };
+    }
+    case "git_checkout_files": {
+      if (!services.checkoutFiles) return serviceNotImplemented(command);
+      const paths = args?.paths;
+      if (!Array.isArray(paths) || paths.length === 0) {
+        return failure("invalid_args", "paths must be a non-empty array");
+      }
+      if (paths.length > 50) {
+        return failure("invalid_args", "paths array exceeds maximum of 50 entries");
+      }
+      const checkoutResult = await runService(() => services.checkoutFiles({ workspace, paths }));
+      return "success" in checkoutResult ? checkoutResult : { success: true, checkedOut: checkoutResult.checkedOut };
+    }
+    case "git_remote_url": {
+      if (!services.getRemoteUrl) return serviceNotImplemented(command);
+      const remote = typeof args?.remote === "string" && args.remote.trim() ? args.remote.trim() : "origin";
+      const remoteResult = await runService(() => services.getRemoteUrl({ workspace, remote }));
+      if ("success" in remoteResult) return remoteResult;
+      return { success: true, remoteUrl: remoteResult.remoteUrl, remote: remoteResult.remote };
+    }
     default:
       return failure("invalid_args", `Unknown Git command: ${command}`);
   }
 }
+function validateMutatingMessage(value) {
+  if (typeof value !== "string" || !value.trim()) {
+    return failure("invalid_args", "message must be a non-empty string");
+  }
+  const msg = value.trim();
+  if (msg.length > 200) {
+    return failure("invalid_args", "message must be 200 characters or fewer");
+  }
+  return msg;
+}
+async function gitCheckpoint(workspace, message, includeUntracked) {
+  const repo = await resolveGitRepository(workspace);
+  const repoRoot = repo.repoRoot;
+  const statusResult = await getGitRepoStatus(workspace);
+  if (statusResult.hasConflicts) {
+    throw new GitCommandError("conflict", "Repository has conflicts \u2014 resolve before checkpointing");
+  }
+  const addArgs = includeUntracked ? ["-A"] : ["-u"];
+  await runGit(repo, ["add", ...addArgs], { cwd: repoRoot });
+  const fullMsg = `adhdev: checkpoint ${message}`;
+  let commitSha;
+  try {
+    await runGit(repo, ["commit", "-m", fullMsg], { cwd: repoRoot });
+    const revResult = await runGit(repo, ["rev-parse", "HEAD"], { cwd: repoRoot });
+    commitSha = revResult.stdout.trim();
+  } catch (err) {
+    const output = (err?.stdout || "") + (err?.stderr || "");
+    if (/nothing to commit/i.test(output)) {
+      throw new GitCommandError("git_command_failed", "Nothing to commit");
+    }
+    throw err;
+  }
+  return {
+    workspace: repo.workspace,
+    repoRoot,
+    isGitRepo: true,
+    commit: commitSha,
+    message: fullMsg,
+    lastCheckedAt: Date.now()
+  };
+}
+async function gitStashPush(workspace, message, includeUntracked) {
+  const repo = await resolveGitRepository(workspace);
+  const repoRoot = repo.repoRoot;
+  const stashArgs = ["stash", "push", "-m", message];
+  if (includeUntracked) stashArgs.push("--include-untracked");
+  const result = await runGit(repo, stashArgs, { cwd: repoRoot });
+  if (/No local changes to save/i.test(result.stdout + result.stderr)) {
+    throw new GitCommandError("git_command_failed", "Nothing to stash");
+  }
+  return {
+    workspace: repo.workspace,
+    repoRoot,
+    isGitRepo: true,
+    stashRef: "stash@{0}",
+    message,
+    lastCheckedAt: Date.now()
+  };
+}
+async function gitStashPop(workspace, stashRef) {
+  const repo = await resolveGitRepository(workspace);
+  const repoRoot = repo.repoRoot;
+  const popArgs = stashRef ? ["stash", "pop", stashRef] : ["stash", "pop"];
+  await runGit(repo, popArgs, { cwd: repoRoot });
+}
+async function gitCheckoutFiles(workspace, paths) {
+  const repo = await resolveGitRepository(workspace);
+  const repoRoot = repo.repoRoot;
+  const normalizedPaths = [];
+  for (const p of paths) {
+    if (typeof p !== "string" || !p.trim() || p.includes("\0")) {
+      throw new GitCommandError("invalid_args", `Invalid path: ${String(p)}`);
+    }
+    if (path3.isAbsolute(p)) {
+      throw new GitCommandError("invalid_args", `Path must be repository-relative, not absolute: ${p}`);
+    }
+    const normalized = path3.normalize(p.trim()).split(path3.sep).join("/");
+    if (normalized.startsWith("../") || normalized === "..") {
+      throw new GitCommandError("path_outside_repo", `Path is outside repository root: ${p}`);
+    }
+    const absolutePath = path3.resolve(repoRoot, normalized);
+    if (!isPathInside(repoRoot, absolutePath)) {
+      throw new GitCommandError("path_outside_repo", `Path is outside repository root: ${p}`);
+    }
+    normalizedPaths.push(normalized);
+  }
+  await runGit(repo, ["checkout", "--", ...normalizedPaths], { cwd: repoRoot });
+  return { checkedOut: normalizedPaths };
+}
+async function gitGetRemoteUrl(workspace, remote) {
+  const repo = await resolveGitRepository(workspace);
+  const result = await runGit(repo, ["remote", "get-url", remote], { cwd: repo.repoRoot });
+  const remoteUrl = result.stdout.trim();
+  if (!remoteUrl) {
+    throw new GitCommandError("git_command_failed", `Remote '${remote}' has no URL`);
+  }
+  return { remoteUrl, remote };
+}
 function formatOptionalGitLogRangeArg(flag, value) {
   return value ? [`${flag}=${value}`] : [];
 }
@@ -1669,7 +1814,7 @@ function validateGitLogPath(repoRoot, filePath) {
   }
   return normalized;
 }
-var path3, GIT_COMMAND_NAMES, MUTATING_COMMAND_NAMES, SNAPSHOT_REASONS, FAILURE_REASONS, defaultSnapshotStore, defaultGitCommandServices;
+var path3, GIT_COMMAND_NAMES, SNAPSHOT_REASONS, FAILURE_REASONS, defaultSnapshotStore, defaultGitCommandServices;
 var init_git_commands = __esm({
   "../../oss/packages/daemon-core/src/git/git-commands.ts"() {
     "use strict";
@@ -1688,13 +1833,8 @@ var init_git_commands = __esm({
       "git_checkpoint",
       "git_stash_push",
       "git_stash_pop",
-      "git_checkout_files"
-    ]);
-    MUTATING_COMMAND_NAMES = /* @__PURE__ */ new Set([
-      "git_checkpoint",
-      "git_stash_push",
-      "git_stash_pop",
-      "git_checkout_files"
+      "git_checkout_files",
+      "git_remote_url"
     ]);
     SNAPSHOT_REASONS = /* @__PURE__ */ new Set([
       "session_baseline",
@@ -1721,6 +1861,33 @@ var init_git_commands = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/git/turn-snapshot-tracker.ts
+var BUSY_STATUSES, TERMINAL_STATUSES, TurnSnapshotTracker;
+var init_turn_snapshot_tracker = __esm({
+  "../../oss/packages/daemon-core/src/git/turn-snapshot-tracker.ts"() {
+    "use strict";
+    BUSY_STATUSES = /* @__PURE__ */ new Set(["streaming", "waiting_approval"]);
+    TERMINAL_STATUSES = /* @__PURE__ */ new Set(["idle", "error"]);
+    TurnSnapshotTracker = class {
+      lastStatus = /* @__PURE__ */ new Map();
+      onTurnCompleted;
+      constructor(onTurnCompleted) {
+        this.onTurnCompleted = onTurnCompleted;
+      }
+      record(sessionId, status, workspace) {
+        const prev = this.lastStatus.get(sessionId);
+        this.lastStatus.set(sessionId, status);
+        if (workspace && prev && BUSY_STATUSES.has(prev) && TERMINAL_STATUSES.has(status)) {
+          this.onTurnCompleted({ sessionId, workspace });
+        }
+      }
+      forget(sessionId) {
+        this.lastStatus.delete(sessionId);
+      }
+    };
+  }
+});
+
 // ../../oss/packages/daemon-core/src/git/index.ts
 var init_git = __esm({
   "../../oss/packages/daemon-core/src/git/index.ts"() {
@@ -1732,6 +1899,7 @@ var init_git = __esm({
     init_git_snapshot_store();
     init_git_monitor();
     init_git_commands();
+    init_turn_snapshot_tracker();
   }
 });
 
@@ -11887,6 +12055,16 @@ var init_handler = __esm({
             return result;
           }
         }
+        if (cmd === "send_chat" && this._ctx.onBeforeSendChat) {
+          const sessionId = this._currentRoute.session?.sessionId;
+          const workspace = sessionId ? this._ctx.instanceManager?.getInstance(sessionId)?.getState?.()?.workspace : void 0;
+          if (workspace && sessionId) {
+            try {
+              this._ctx.onBeforeSendChat({ workspace, sessionId });
+            } catch {
+            }
+          }
+        }
         try {
           result = await this.dispatch(cmd, args);
           this.logCommandEnd(cmd, result, startedAt);
@@ -14164,6 +14342,7 @@ function resolveCliAdapterConfig(provider) {
     sendDelayMs: typeof provider.sendDelayMs === "number" ? Math.max(0, provider.sendDelayMs) : 0,
     sendKey: typeof provider.sendKey === "string" && provider.sendKey.length > 0 ? provider.sendKey : "\r",
     submitStrategy: provider.submitStrategy === "immediate" ? "immediate" : "wait_for_echo",
+    requirePromptEchoBeforeSubmit: provider.requirePromptEchoBeforeSubmit === true,
     providerResolutionMeta: {
       type: provider.type,
       name: provider.name,
@@ -14429,6 +14608,7 @@ var init_provider_cli_adapter = __esm({
         this.sendDelayMs = resolvedConfig.sendDelayMs;
         this.sendKey = resolvedConfig.sendKey;
         this.submitStrategy = resolvedConfig.submitStrategy;
+        this.requirePromptEchoBeforeSubmit = resolvedConfig.requirePromptEchoBeforeSubmit;
         this.providerResolutionMeta = resolvedConfig.providerResolutionMeta;
         this.cliScripts = provider.scripts || {};
         const scriptNames = listCliScriptNames(this.cliScripts);
@@ -14525,6 +14705,12 @@ var init_provider_cli_adapter = __esm({
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
       terminalScreen = new TerminalScreen(24, 80);
+      static MAX_RESPONSE_BUFFER = 8e3;
+      static MAX_RECENT_OUTPUT_BUFFER = 1e3;
+      responseBufferDroppedChars = 0;
+      recentOutputDroppedChars = 0;
+      accumulatedBufferDroppedChars = 0;
+      accumulatedRawBufferDroppedChars = 0;
       /** Max accumulated buffer size. Sized to comfortably hold a single long
        *  Hermes turn (tool calls + reasoning + final bubble) without the
        *  rolling window pushing the turn's ╭─ opening line out of view. */
@@ -14542,6 +14728,23 @@ var init_provider_cli_adapter = __esm({
       providerResolutionMeta;
       static FINISH_RETRY_DELAY_MS = 300;
       static MAX_FINISH_RETRIES = 2;
+      getBufferState() {
+        const build = (droppedChars, maxChars) => droppedChars > 0 ? { truncated: true, droppedChars, maxChars } : void 0;
+        const responseBuffer = build(this.responseBufferDroppedChars, _ProviderCliAdapter.MAX_RESPONSE_BUFFER);
+        const recentOutputBuffer = build(this.recentOutputDroppedChars, _ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
+        const accumulatedBuffer = build(this.accumulatedBufferDroppedChars, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const accumulatedRawBuffer = build(this.accumulatedRawBufferDroppedChars, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        if (!responseBuffer && !recentOutputBuffer && !accumulatedBuffer && !accumulatedRawBuffer) return void 0;
+        return {
+          ...responseBuffer ? { responseBuffer } : {},
+          ...recentOutputBuffer ? { recentOutputBuffer } : {},
+          ...accumulatedBuffer ? { accumulatedBuffer } : {},
+          ...accumulatedRawBuffer ? { accumulatedRawBuffer } : {}
+        };
+      }
+      recordBoundedAppendDrop(previousLength, appendedLength, nextLength) {
+        return Math.max(0, previousLength + appendedLength - nextLength);
+      }
       buildCommittedMessagesActivitySignature() {
         const last = this.committedMessages[this.committedMessages.length - 1];
         return [
@@ -14725,6 +14928,7 @@ var init_provider_cli_adapter = __esm({
       sendDelayMs;
       sendKey;
       submitStrategy;
+      requirePromptEchoBeforeSubmit;
       static SCRIPT_STATUS_DEBOUNCE_MS = 3e3;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
@@ -14906,7 +15110,9 @@ var init_provider_cli_adapter = __esm({
           this.scheduleStartupSettleCheck();
         }
         if (this.isWaitingForResponse && cleanData) {
-          this.responseBuffer = appendBoundedText(this.responseBuffer, cleanData, 8e3);
+          const previousResponseLen = this.responseBuffer.length;
+          this.responseBuffer = appendBoundedText(this.responseBuffer, cleanData, _ProviderCliAdapter.MAX_RESPONSE_BUFFER);
+          this.responseBufferDroppedChars += this.recordBoundedAppendDrop(previousResponseLen, cleanData.length, this.responseBuffer.length);
         }
         if (cleanData.trim()) {
           if (this.serverConn) {
@@ -14915,14 +15121,19 @@ var init_provider_cli_adapter = __esm({
             this.logBuffer.push({ message: cleanData.trim(), level: "info" });
           }
         }
+        const prevRecentLen = this.recentOutputBuffer.length;
         const prevAccumulatedLen = this.accumulatedBuffer.length;
         const prevAccumulatedRawLen = this.accumulatedRawBuffer.length;
-        this.recentOutputBuffer = appendBoundedText(this.recentOutputBuffer, cleanData, 1e3);
+        this.recentOutputBuffer = appendBoundedText(this.recentOutputBuffer, cleanData, _ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
         this.accumulatedBuffer = appendBoundedText(this.accumulatedBuffer, cleanData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
         this.accumulatedRawBuffer = appendBoundedText(this.accumulatedRawBuffer, rawData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const droppedRecent = this.recordBoundedAppendDrop(prevRecentLen, cleanData.length, this.recentOutputBuffer.length);
+        const droppedClean = this.recordBoundedAppendDrop(prevAccumulatedLen, cleanData.length, this.accumulatedBuffer.length);
+        const droppedRaw = this.recordBoundedAppendDrop(prevAccumulatedRawLen, rawData.length, this.accumulatedRawBuffer.length);
+        this.recentOutputDroppedChars += droppedRecent;
+        this.accumulatedBufferDroppedChars += droppedClean;
+        this.accumulatedRawBufferDroppedChars += droppedRaw;
         if (this.currentTurnScope) {
-          const droppedClean = prevAccumulatedLen + cleanData.length - this.accumulatedBuffer.length;
-          const droppedRaw = prevAccumulatedRawLen + rawData.length - this.accumulatedRawBuffer.length;
           if (droppedClean > 0) {
             this.currentTurnScope.bufferStart = Math.max(0, this.currentTurnScope.bufferStart - droppedClean);
           }
@@ -15752,13 +15963,15 @@ var init_provider_cli_adapter = __esm({
             effectiveModal = parsedModal;
           }
         }
+        const bufferState = this.getBufferState();
         return {
           status: effectiveStatus,
           messages: [...this.committedMessages],
           workingDir: this.workingDir,
           activeModal: effectiveModal,
           errorMessage: this.parseErrorMessage || void 0,
-          errorReason: this.parseErrorMessage ? "parse_error" : void 0
+          errorReason: this.parseErrorMessage ? "parse_error" : void 0,
+          ...bufferState ? { bufferState } : {}
         };
       }
       seedCommittedMessages(messages) {
@@ -15940,10 +16153,12 @@ var init_provider_cli_adapter = __esm({
             messages: hydratedMessages,
             activeModal: parsed.activeModal ?? this.activeModal,
             providerSessionId: typeof parsed.providerSessionId === "string" ? parsed.providerSessionId : void 0,
+            ...this.getBufferState() ? { bufferState: this.getBufferState() } : {},
             ...this.providerOwnsTranscript() ? { transcriptAuthority: "provider", coverage: this.shouldUseFullProviderTranscriptContext() ? "full" : "tail" } : {}
           };
         } else {
           const messages = [...this.committedMessages];
+          const bufferState = this.getBufferState();
           result = {
             id: "cli_session",
             status: this.currentStatus,
@@ -15954,7 +16169,8 @@ var init_provider_cli_adapter = __esm({
               index: typeof message.index === "number" ? message.index : index,
               receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
             })),
-            activeModal: this.activeModal
+            activeModal: this.activeModal,
+            ...bufferState ? { bufferState } : {}
           };
         }
         const hasVisibleAssistantMessage = Array.isArray(result?.messages) && result.messages.some((message) => message?.role === "assistant" && typeof message?.content === "string" && message.content.trim());
@@ -16245,6 +16461,22 @@ var init_provider_cli_adapter = __esm({
           }
         }
         if (elapsed >= state.maxEchoWaitMs) {
+          const diagnostic = {
+            elapsed,
+            maxEchoWaitMs: state.maxEchoWaitMs,
+            submitDelayMs: state.submitDelayMs,
+            promptSnippet: state.normalizedPromptSnippet,
+            requirePromptEchoBeforeSubmit: this.requirePromptEchoBeforeSubmit,
+            screenText: summarizeCliTraceText(screenText, 1e3)
+          };
+          this.recordTrace("submit_echo_missing", diagnostic);
+          if (this.requirePromptEchoBeforeSubmit) {
+            const message = `${this.cliName} prompt echo was not observed on the PTY screen before submit`;
+            LOG.warn("CLI", `[${this.cliType}] ${message} elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
+            completion.rejectOnce(new Error(message));
+            return;
+          }
+          LOG.warn("CLI", `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
           this.submitSendKey(state, completion);
           return;
         }
@@ -16709,6 +16941,7 @@ var init_provider_cli_adapter = __esm({
           sendDelayMs: this.sendDelayMs,
           sendKey: this.sendKey,
           submitStrategy: this.submitStrategy,
+          requirePromptEchoBeforeSubmit: this.requirePromptEchoBeforeSubmit,
           submitPendingUntil: this.submitPendingUntil,
           responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
           resizeSuppressUntil: this.resizeSuppressUntil,
@@ -38009,6 +38242,7 @@ var init_provider_schema = __esm({
       "sendDelayMs",
       "sendKey",
       "submitStrategy",
+      "requirePromptEchoBeforeSubmit",
       "timeouts",
       "disableUpstream"
     ]);
@@ -49584,6 +49818,7 @@ async function initDaemonComponents(config2) {
     providerLoader,
     instanceManager,
     sessionRegistry,
+    gitCommandServices: createDefaultGitCommandServices(),
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config2.onStatusChange?.();
@@ -49591,7 +49826,8 @@ async function initDaemonComponents(config2) {
     onProviderSourceConfigChanged: async () => {
       await refreshProviderAvailability();
       config2.onStatusChange?.();
-    }
+    },
+    onBeforeSendChat: config2.onBeforeSendChat
   });
   agentStreamManager = new DaemonAgentStreamManager(
     LOG.forComponent("AgentStream").asLogFn(),
@@ -49717,6 +49953,7 @@ var init_daemon_lifecycle = __esm({
     init_logger();
     init_runtime_defaults();
     init_config();
+    init_git_commands();
   }
 });
 
@@ -49767,6 +50004,7 @@ __export(src_exports, {
   ProviderLoader: () => ProviderLoader,
   STANDALONE_CDP_SCAN_INTERVAL_MS: () => STANDALONE_CDP_SCAN_INTERVAL_MS,
   SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory,
+  TurnSnapshotTracker: () => TurnSnapshotTracker,
   VersionArchive: () => VersionArchive,
   appendRecentActivity: () => appendRecentActivity,
   buildAssistantChatMessage: () => buildAssistantChatMessage,
@@ -81050,7 +81288,7 @@ function sendToPeer(peer, data) {
     return false;
   }
   const json2 = JSON.stringify(data);
-  if (messageType === "command_result" && json2.length > MAX_INLINE_JSON_MESSAGE_CHARS) {
+  if (messageType === "command_result" && Buffer.byteLength(json2, "utf8") > MAX_INLINE_JSON_MESSAGE_CHARS) {
     return sendChunkedCommandResult(peer, peerId, requestId, json2);
   }
   try {
@@ -81063,21 +81301,51 @@ function sendToPeer(peer, data) {
     return false;
   }
 }
+function buildCommandResultChunkEnvelope(requestId, chunkId, index, total, data) {
+  return JSON.stringify({
+    type: "command_result_chunk",
+    id: requestId,
+    chunkId,
+    index,
+    total,
+    data
+  });
+}
+function splitJsonIntoCommandResultChunks(json2, requestId, chunkId) {
+  const chunks = [];
+  let offset = 0;
+  while (offset < json2.length) {
+    let end = Math.min(json2.length, offset + JSON_CHUNK_PAYLOAD_CHARS);
+    while (end > offset) {
+      const candidate = json2.slice(offset, end);
+      const envelope = buildCommandResultChunkEnvelope(requestId, chunkId, chunks.length, MAX_JSON_CHUNKS, candidate);
+      if (Buffer.byteLength(envelope, "utf8") <= MAX_INLINE_JSON_MESSAGE_BYTES) break;
+      end = offset + Math.max(1, Math.floor((end - offset) * 0.8));
+    }
+    chunks.push(json2.slice(offset, end));
+    if (chunks.length > MAX_JSON_CHUNKS) return [];
+    offset = end;
+  }
+  return chunks;
+}
 function sendChunkedCommandResult(peer, peerId, requestId, json2) {
   const chunkId = requestId || `command_result_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-  const total = Math.ceil(json2.length / JSON_CHUNK_PAYLOAD_CHARS);
+  const chunks = splitJsonIntoCommandResultChunks(json2, requestId, chunkId);
+  const total = chunks.length;
+  if (total === 0 || total > MAX_JSON_CHUNKS) {
+    log(`command_result send failed: peer=${peerId} id=${requestId || "-"} reason=too_many_chunks chunks=${total || "unknown"}`);
+    return false;
+  }
   logDebug(`command_result chunked: peer=${peerId} id=${requestId || "-"} chars=${json2.length} chunks=${total}`);
   for (let index = 0; index < total; index += 1) {
-    const chunk = json2.slice(index * JSON_CHUNK_PAYLOAD_CHARS, (index + 1) * JSON_CHUNK_PAYLOAD_CHARS);
+    const chunk = chunks[index] || "";
     try {
-      peer.dataChannel?.sendMessage(JSON.stringify({
-        type: "command_result_chunk",
-        id: requestId,
-        chunkId,
-        index,
-        total,
-        data: chunk
-      }));
+      const envelope = buildCommandResultChunkEnvelope(requestId, chunkId, index, total, chunk);
+      if (Buffer.byteLength(envelope, "utf8") > MAX_INLINE_JSON_MESSAGE_BYTES) {
+        log(`command_result send failed: peer=${peerId} id=${requestId || "-"} chunk=${index + 1}/${total} reason=chunk_too_large`);
+        return false;
+      }
+      peer.dataChannel?.sendMessage(envelope);
     } catch (error48) {
       log(`command_result send failed: peer=${peerId} id=${requestId || "-"} chunk=${index + 1}/${total} error=${error48?.message || error48}`);
       return false;
@@ -81085,10 +81353,58 @@ function sendChunkedCommandResult(peer, peerId, requestId, json2) {
   }
   return true;
 }
+function parseChunkedJsonMessage(peerId, parsed) {
+  const chunkType = typeof parsed?.type === "string" ? parsed.type : "";
+  if (!chunkType.endsWith("_chunk")) return parsed;
+  const chunkId = typeof parsed?.chunkId === "string" ? parsed.chunkId : "";
+  const id = typeof parsed?.id === "string" ? parsed.id : "";
+  const index = Number(parsed?.index);
+  const total = Number(parsed?.total);
+  const data = typeof parsed?.data === "string" ? parsed.data : "";
+  if (!chunkId || !Number.isInteger(index) || !Number.isInteger(total) || index < 0 || total <= 0 || total > MAX_JSON_CHUNKS || index >= total || !data) {
+    log(`chunked JSON ignored: peer=${peerId} type=${chunkType || "unknown"} reason=malformed`);
+    return null;
+  }
+  const now = Date.now();
+  incomingJsonChunks.forEach((entry2, key2) => {
+    if (now - entry2.createdAt > JSON_CHUNK_TTL_MS) incomingJsonChunks.delete(key2);
+  });
+  const key = `${peerId}:${chunkId}`;
+  let entry = incomingJsonChunks.get(key);
+  if (!entry || entry.total !== total || entry.type !== chunkType) {
+    entry = { total, chunks: new Array(total).fill(""), received: 0, createdAt: now, type: chunkType, id };
+    incomingJsonChunks.set(key, entry);
+  }
+  if (!entry.chunks[index]) {
+    entry.chunks[index] = data;
+    entry.received += 1;
+  }
+  if (entry.received < entry.total) return null;
+  incomingJsonChunks.delete(key);
+  try {
+    return JSON.parse(entry.chunks.join(""));
+  } catch (error48) {
+    log(`chunked JSON parse failed: peer=${peerId} type=${chunkType} id=${entry.id || "-"} error=${error48?.message || error48}`);
+    return CHUNK_PARSE_FAILED;
+  }
+}
 function routeDataChannelMessage(peerId, msg, peers, handlers) {
   const text = typeof msg === "string" ? msg : msg.toString("utf-8");
   try {
-    const parsed = JSON.parse(text);
+    let parsed = JSON.parse(text);
+    const chunked = parseChunkedJsonMessage(peerId, parsed);
+    if (chunked === null) return;
+    if (chunked === CHUNK_PARSE_FAILED) {
+      const peer = peers.get(peerId);
+      const id = typeof parsed?.id === "string" ? parsed.id : "";
+      if (parsed?.type === "command_chunk") {
+        sendToPeer(peer, { type: "command_result", id, success: false, error: "Failed to reassemble chunked command" });
+      } else if (id) {
+        sendToPeer(peer, { id, type: "response", success: false, error: "Failed to reassemble chunked request" });
+      }
+      return;
+    }
+    parsed = chunked;
     if (parsed.type !== "command" && parsed.type !== "pty_input" && parsed.type !== "pty_resize" && parsed.type !== "ping" && parsed.type !== "pong") {
       logDebug(`Files message from peer ${peerId}: type=${parsed.type}`);
     }
@@ -81384,7 +81700,7 @@ async function handleFileRequest(peerId, req, peers, handlers) {
   }
   sendToPeer(peer, response);
 }
-var MAX_INLINE_JSON_MESSAGE_CHARS, JSON_CHUNK_PAYLOAD_CHARS;
+var MAX_INLINE_JSON_MESSAGE_CHARS, MAX_INLINE_JSON_MESSAGE_BYTES, JSON_CHUNK_PAYLOAD_CHARS, JSON_CHUNK_TTL_MS, MAX_JSON_CHUNKS, CHUNK_PARSE_FAILED, incomingJsonChunks;
 var init_data_channel_router = __esm({
   "src/daemon-p2p/data-channel-router.ts"() {
     "use strict";
@@ -81392,18 +81708,23 @@ var init_data_channel_router = __esm({
     init_permission();
     init_log();
     MAX_INLINE_JSON_MESSAGE_CHARS = 6e4;
-    JSON_CHUNK_PAYLOAD_CHARS = 32e3;
+    MAX_INLINE_JSON_MESSAGE_BYTES = 6e4;
+    JSON_CHUNK_PAYLOAD_CHARS = 16e3;
+    JSON_CHUNK_TTL_MS = 6e4;
+    MAX_JSON_CHUNKS = 1024;
+    CHUNK_PARSE_FAILED = /* @__PURE__ */ Symbol("chunk_parse_failed");
+    incomingJsonChunks = /* @__PURE__ */ new Map();
   }
 });
 
 // src/daemon-p2p/screenshot-sender.ts
-var CHUNK_SIZE, MAX_INLINE_JSON_MESSAGE_BYTES, JSON_CHUNK_PAYLOAD_CHARS2, ScreenshotSender;
+var CHUNK_SIZE, MAX_INLINE_JSON_MESSAGE_BYTES2, JSON_CHUNK_PAYLOAD_CHARS2, ScreenshotSender;
 var init_screenshot_sender = __esm({
   "src/daemon-p2p/screenshot-sender.ts"() {
     "use strict";
     init_log();
     CHUNK_SIZE = 6e4;
-    MAX_INLINE_JSON_MESSAGE_BYTES = 6e4;
+    MAX_INLINE_JSON_MESSAGE_BYTES2 = 6e4;
     JSON_CHUNK_PAYLOAD_CHARS2 = 16e3;
     ScreenshotSender = class {
       _ssDebugDone = false;
@@ -81447,7 +81768,7 @@ var init_screenshot_sender = __esm({
           type: "topic_update",
           update
         });
-        if (Buffer.byteLength(json2, "utf8") > MAX_INLINE_JSON_MESSAGE_BYTES) {
+        if (Buffer.byteLength(json2, "utf8") > MAX_INLINE_JSON_MESSAGE_BYTES2) {
           return this.sendChunkedTopicUpdate(peer, update, json2);
         }
         try {
@@ -81486,6 +81807,10 @@ var init_screenshot_sender = __esm({
         let sentAny = false;
         for (const peer of peers.values()) {
           if (peer.state !== "connected" || !peer.dataChannel?.isOpen()) continue;
+          if (Buffer.byteLength(msg, "utf8") > MAX_INLINE_JSON_MESSAGE_BYTES2) {
+            if (this.sendChunkedSessionOutput(peer, sessionId, msg)) sentAny = true;
+            continue;
+          }
           try {
             peer.dataChannel.sendMessage(msg);
             sentAny = true;
@@ -81494,6 +81819,27 @@ var init_screenshot_sender = __esm({
         }
         return sentAny;
       }
+      sendChunkedSessionOutput(peer, sessionId, json2) {
+        const chunkId = `session_output:${sessionId}:${Date.now()}:${Math.random().toString(36).slice(2, 8)}`;
+        const total = Math.ceil(json2.length / JSON_CHUNK_PAYLOAD_CHARS2);
+        logDebug(`session_output chunked: peer=${peer.peerId || "unknown"} sessionId=${sessionId || "-"} chars=${json2.length} chunks=${total}`);
+        for (let index = 0; index < total; index += 1) {
+          const chunk = json2.slice(index * JSON_CHUNK_PAYLOAD_CHARS2, (index + 1) * JSON_CHUNK_PAYLOAD_CHARS2);
+          try {
+            peer.dataChannel?.sendMessage(JSON.stringify({
+              type: "session_output_chunk",
+              sessionId,
+              chunkId,
+              index,
+              total,
+              data: chunk
+            }));
+          } catch {
+            return false;
+          }
+        }
+        return true;
+      }
       sendScreenshot(peers, base64Data, targetSessionId) {
         const buffer = Buffer.from(base64Data, "base64");
         return this.sendScreenshotBuffer(peers, buffer, targetSessionId);
@@ -89833,7 +90179,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.54" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.56" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -89857,6 +90203,19 @@ var init_adhdev_daemon = __esm({
       sessionHostEndpoint = null;
       sessionHostController = null;
       gitWorkspaceMonitor = createGitWorkspaceMonitor();
+      turnSnapshotTracker = new TurnSnapshotTracker(({ sessionId, workspace }) => {
+        const gitServices = this.components?.commandHandler?.ctx?.gitCommandServices;
+        if (gitServices?.createSnapshot) {
+          void Promise.resolve(gitServices.createSnapshot({
+            workspace,
+            reason: "after_agent_work",
+            sessionId
+          })).catch(() => {
+          });
+        }
+        void this.gitWorkspaceMonitor.refresh({ workspace, includeDiffSummary: false }).catch(() => {
+        });
+      });
       running = false;
       localPort;
       ideType = "unknown";
@@ -90028,7 +90387,8 @@ var init_adhdev_daemon = __esm({
           })),
           instanceId: `daemon_${loadConfig().machineId || "daemon"}`,
           version: pkgVersion,
-          profile: "live"
+          profile: "live",
+          getGitSummaryForWorkspace: (workspace) => this.gitWorkspaceMonitor.getCompactSummary(workspace)
         });
       }
       invalidateHotChatSnapshotCache() {
@@ -90214,7 +90574,8 @@ var init_adhdev_daemon = __esm({
           })),
           instanceId: `daemon_${loadConfig().machineId || "daemon"}`,
           version: pkgVersion,
-          profile: "metadata"
+          profile: "metadata",
+          getGitSummaryForWorkspace: (workspace) => this.gitWorkspaceMonitor.getCompactSummary(workspace)
         });
       }
       buildDaemonMetadataUpdateForSubscription(subscription) {
@@ -90358,6 +90719,27 @@ ${err?.stack || ""}`);
             onStreamsUpdated: (ideType, streams) => {
               if (!this.components) return;
               forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
+              for (const stream of streams) {
+                if (stream.sessionId) {
+                  const workspace = this.components?.instanceManager?.getInstance(stream.sessionId)?.getState()?.workspace;
+                  this.turnSnapshotTracker.record(stream.sessionId, stream.status || "idle", workspace);
+                }
+              }
+            },
+            onBeforeSendChat: ({ workspace }) => {
+              void this.gitWorkspaceMonitor.refresh({
+                workspace,
+                includeDiffSummary: false
+              }).catch(() => {
+              });
+              const gitServices = this.components?.commandHandler?.ctx?.gitCommandServices;
+              if (gitServices?.createSnapshot) {
+                void Promise.resolve(gitServices.createSnapshot({
+                  workspace,
+                  reason: "before_user_input_dispatch"
+                })).catch(() => {
+                });
+              }
             }
           });
           const providerSourceConfig = this.components.providerLoader.getSourceConfig();