@agent-native/core 0.12.21 → 0.12.23

package/dist/server/agent-chat-plugin.js

@@ -2618,11 +2618,28 @@ export function createAgentChatPlugin(options) {
                     resolveOrgId: options?.resolveOrgId,
                 });
             }
+            const preRunGitStatusByThread = new Map();
+            async function recordPreRunGitStatus(threadId) {
+                if (!isDevMode())
+                    return;
+                try {
+                    const { getUncommittedStatus, isGitRepo } = await import("../checkpoints/service.js");
+                    const cwd = process.cwd();
+                    preRunGitStatusByThread.set(threadId, isGitRepo(cwd) ? getUncommittedStatus(cwd) : null);
+                }
+                catch {
+                    preRunGitStatusByThread.set(threadId, null);
+                }
+            }
             // Callback to persist agent response when run finishes (even if client disconnected).
             // Reconstructs the assistant message from buffered events and appends to thread_data.
             const onRunComplete = async (run, threadId) => {
-                if (!threadId)
+                const runThreadId = String(run?.threadId ?? threadId ?? "");
+                if (!threadId) {
+                    if (runThreadId)
+                        preRunGitStatusByThread.delete(runThreadId);
                     return;
+                }
                 // Serialize the read-modify-write against the same thread's other
                 // `thread_data` writers (setThreadQueuedMessages, setThreadEngineMeta,
                 // the frontend-triggered saves below). Without the lock, a concurrent
@@ -2707,9 +2724,21 @@ export function createAgentChatPlugin(options) {
                     // Auto-checkpoint in dev mode after file-modifying agent turns
                     if (isDevMode()) {
                         try {
-                            const { createCheckpoint: gitCheckpoint, isGitRepo, hasUncommittedChanges, getChangedFileNames, } = await import("../checkpoints/service.js");
+                            const { createCheckpoint: gitCheckpoint, isGitRepo, hasUncommittedChanges, getChangedFileNames, getUncommittedStatus, } = await import("../checkpoints/service.js");
                             const cwd = process.cwd();
-                            if (isGitRepo(cwd) && hasUncommittedChanges(cwd)) {
+                            const preRunStatus = runThreadId
+                                ? preRunGitStatusByThread.get(runThreadId)
+                                : undefined;
+                            if (runThreadId)
+                                preRunGitStatusByThread.delete(runThreadId);
+                            // Only auto-commit checkpoints for changes produced by this run.
+                            // If the tree was already dirty, a checkpoint commit would sweep
+                            // up the user's unrelated work when a reconnect/refresh finishes.
+                            const postRunStatus = getUncommittedStatus(cwd);
+                            if (preRunStatus === "" &&
+                                postRunStatus?.trim() &&
+                                isGitRepo(cwd) &&
+                                hasUncommittedChanges(cwd)) {
                                 let summary = "";
                                 // Try to extract the first sentence of the assistant's text response
                                 let assistantText = "";
@@ -2928,7 +2957,8 @@ export function createAgentChatPlugin(options) {
                         runCtx.model = model;
                     }
                 },
-                onRunStart: (send, threadId) => {
+                onRunStart: async (send, threadId) => {
+                    await recordPreRunGitStatus(threadId);
                     _runSendByThread.set(threadId, send);
                     const runCtx = ensureRequestRunContext();
                     if (runCtx)
@@ -2963,7 +2993,8 @@ export function createAgentChatPlugin(options) {
                             runCtx.model = model;
                         }
                     },
-                    onRunStart: (send, threadId) => {
+                    onRunStart: async (send, threadId) => {
+                        await recordPreRunGitStatus(threadId);
                         _runSendByThread.set(threadId, send);
                         const runCtx = ensureRequestRunContext();
                         if (runCtx)
@@ -3046,7 +3077,8 @@ export function createAgentChatPlugin(options) {
                             runCtx.model = model;
                         }
                     },
-                    onRunStart: (send, threadId) => {
+                    onRunStart: async (send, threadId) => {
+                        await recordPreRunGitStatus(threadId);
                         _runSendByThread.set(threadId, send);
                         const runCtx = ensureRequestRunContext();
                         if (runCtx)