@agent-native/core 0.108.0 → 0.109.0

package/dist/client/agent-chat-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-chat-adapter.d.ts","sourceRoot":"","sources":["../../src/client/agent-chat-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,qBAAqB,CAAC;AAWhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAqBrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,MAAM,oBAAoB;AAC9B;;;;GAIG;AACD,KAAK;AACP,0EAA0E;GACxE,WAAW;AACb,wEAAwE;GACtE,SAAS,CAAC;AAwId,eAAO,MAAM,iCAAiC,SAAU,CAAC;AAorCzD;;;;GAIG;AACH;;;GAGG;AACH,MAAM,WAAW,6BAA6B;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAC3C,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,SAAS,CAAA;KAAE,CAAC;IACrD,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAC;IAC3D,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAyED,wBAAgB,sBAAsB,CACpC,OAAO,CAAC,EAAE,6BAA6B,GACtC,gBAAgB,CAkrElB"}
+{"version":3,"file":"agent-chat-adapter.d.ts","sourceRoot":"","sources":["../../src/client/agent-chat-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,qBAAqB,CAAC;AAWhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAqBrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,MAAM,oBAAoB;AAC9B;;;;GAIG;AACD,KAAK;AACP,0EAA0E;GACxE,WAAW;AACb,wEAAwE;GACtE,SAAS,CAAC;AAwId,eAAO,MAAM,iCAAiC,SAAU,CAAC;AAorCzD;;;;GAIG;AACH;;;GAGG;AACH,MAAM,WAAW,6BAA6B;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAC3C,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,SAAS,CAAA;KAAE,CAAC;IACrD,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAC;IAC3D,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAyED,wBAAgB,sBAAsB,CACpC,OAAO,CAAC,EAAE,6BAA6B,GACtC,gBAAgB,CAoqElB"}

package/dist/client/agent-chat-adapter.js

@@ -1504,6 +1504,8 @@ export function createAgentChatAdapter(options) {
                     lastSeq = -1;
                 }
             };
+            const canAttachRun = (candidateRunId, candidateTurnId) => attemptedRunIds.includes(candidateRunId) ||
+                (candidateTurnId.length > 0 && candidateTurnId === turnId);
             const preparingActionStateForRun = (id) => {
                 if (!id)
                     return undefined;
@@ -1682,13 +1684,12 @@ export function createAgentChatAdapter(options) {
                             }
                             const active = await activeRes.json();
                             if (active?.active && active.runId) {
-                                updateCurrentRunDispatchMode(active.dispatchMode);
-                                const activeStatus = typeof active.status === "string" ? active.status : "";
+                                const activeRunId = String(active.runId);
                                 const activeTurnId = typeof active.turnId === "string" ? active.turnId : "";
-                                if (activeStatus !== "running" && activeTurnId !== turnId) {
+                                if (!canAttachRun(activeRunId, activeTurnId)) {
                                     return false;
                                 }
-                                const activeRunId = String(active.runId);
+                                updateCurrentRunDispatchMode(active.dispatchMode);
                                 const previousRunId = runId;
                                 runId = activeRunId;
                                 if (!attemptedRunIds.includes(activeRunId)) {
@@ -1744,18 +1745,18 @@ export function createAgentChatAdapter(options) {
                             const dispatchMode = typeof active.dispatchMode === "string"
                                 ? active.dispatchMode
                                 : "";
+                            const activeTurnId = typeof active.turnId === "string" ? active.turnId : "";
+                            if (!canAttachRun(activeRunId, activeTurnId))
+                                return false;
                             updateCurrentRunDispatchMode(dispatchMode);
                             if (activeRunId === interruptedRunId) {
                                 if (dispatchMode.startsWith("background"))
                                     continue;
                                 return false;
                             }
-                            const activeTurnId = typeof active.turnId === "string" ? active.turnId : "";
                             const activeStatus = typeof active.status === "string" ? active.status : "";
                             if (!dispatchMode.startsWith("background"))
                                 return false;
-                            if (activeTurnId && activeTurnId !== turnId)
-                                return false;
                             if (activeStatus !== "running" && activeStatus !== "starting") {
                                 return false;
                             }
@@ -2056,10 +2057,7 @@ export function createAgentChatAdapter(options) {
                         const activeStatus = typeof active?.status === "string" ? active.status : "";
                         // Only follow runs belonging to THIS turn (server-chained
                         // successors reuse the turnId) or runs we already attached to.
-                        const isOurRun = activeRunId !== null &&
-                            (attemptedRunIds.includes(activeRunId) ||
-                                !activeTurnId ||
-                                activeTurnId === turnId);
+                        const isOurRun = activeRunId !== null && canAttachRun(activeRunId, activeTurnId);
                         if (activeRunId && isOurRun) {
                             lastSeenActive = active;
                             updateCurrentRunDispatchMode(active?.dispatchMode);
@@ -2531,11 +2529,18 @@ export function createAgentChatAdapter(options) {
                                 // active run is one this adapter already consumed, reconnecting
                                 // to it replays the terminal auto_continue and exits instead of
                                 // posting the continuation. Wait for stale/previous active runs
-                                // to clear and retry THIS prompt. A genuinely newer background
-                                // run still falls through to the reconnect path below.
-                                const shouldRetryConflictingActiveRun = activeRunId !== null &&
-                                    (!internalContinuationRequest ||
-                                        attemptedRunIds.includes(activeRunId));
+                                // to clear and retry THIS prompt. An unknown run reported to an
+                                // internal continuation is only adoptable after /runs/active
+                                // proves it carries this turnId; a bare 409 run id is not
+                                // enough ownership evidence.
+                                if (activeRunId !== null &&
+                                    internalContinuationRequest &&
+                                    !attemptedRunIds.includes(activeRunId)) {
+                                    const reconnected = yield* reconnectActiveRunForThread();
+                                    if (reconnected)
+                                        return;
+                                }
+                                const shouldRetryConflictingActiveRun = activeRunId !== null;
                                 if (shouldRetryConflictingActiveRun) {
                                     queuedConflictRetries += 1;
                                     if (queuedConflictRetries <= MAX_QUEUED_CONFLICT_RETRIES) {
@@ -2583,29 +2588,6 @@ export function createAgentChatAdapter(options) {
                                     clearActiveRun();
                                     return;
                                 }
-                                if (activeRunId) {
-                                    try {
-                                        const previousRunId = runId;
-                                        runId = activeRunId;
-                                        if (!attemptedRunIds.includes(runId)) {
-                                            attemptedRunIds.push(runId);
-                                        }
-                                        reconnectCursorForRun(activeRunId, previousRunId);
-                                        if (threadId) {
-                                            setActiveRun({ threadId, runId, lastSeq });
-                                        }
-                                        const reconnected = yield* reconnectCurrentRun();
-                                        if (reconnected)
-                                            return;
-                                        await delay(1000, abortSignal);
-                                        if (abortSignal.aborted)
-                                            return;
-                                        continue;
-                                    }
-                                    catch {
-                                        // Fall through to the generic response handling below.
-                                    }
-                                }
                             }
                             if (res.status === 401 || res.status === 403) {
                                 if (await tryRecoverAuthOnce()) {