@qduc/term2 0.9.2 → 0.9.4

package/dist/services/session/terminal-result-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"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"}

package/dist/services/session/test-helpers/conversation-session-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,GAAI,UAAS,CAAC,MAAM,EAAE,OAAO,CAAC,EAAO,KAAG,gBAG7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,YAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,KAAG,uBAStC,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAQ,gBAG7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAQ,uBAStC,CAAC"}

package/dist/services/session/test-helpers/conversation-session-fixtures.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAI/D,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,UAA+B,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,EAAE,CAAI,GAAW,EAAK,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAAqC,EAAE,EAA2B,EAAE,CACxG,CAAC;IACC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;IAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IACpB,GAAG,SAAS;CAC0B,CAAA,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAI/D,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAO,GAAwB,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,EAAE,CAAI,GAAW,EAAK,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAA4B,EAAE,EAA2B,EAAE,CACxG,CAAC;IACC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;IAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IACpB,GAAG,SAAS;CAC0B,CAAA,CAAC"}

package/dist/services/session/turn-attempt-factory.d.ts

@@ -6,6 +6,7 @@ import type { ConversationStore } from '../conversation/conversation-store.js';
 import type { UserTurn } from '../../types/user-turn.js';
 import type { SessionLifecycle } from './session-lifecycle.js';
 import type { SessionToolTracker } from './session-tool-tracker.js';
+import type { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
 import { TurnAttempt } from './turn-attempt.js';
 export type InitialTurnRunOptions = {
     skipUserMessage?: boolean;
@@ -28,6 +29,7 @@ export type TurnAttemptFactoryDeps = {
     toolTracker: SessionToolTracker;
     state: SessionLifecycle;
     resolveRetryLimit: () => number;
+    journal: AssistantTurnJournal;
 };
 export type TurnAttemptCreationResult = {
     kind: 'created';

package/dist/services/session/turn-attempt-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,gBAAgB,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtG,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAEzD,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,qBAA0B,GAAG,yBAAyB;CAsDjG"}
+{"version":3,"file":"turn-attempt-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,gBAAgB,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtG,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,sBAAsB,EAAI;IAE7D,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,qBAA0B,GAAG,yBAAyB,CAkC/F;CAoBF"}

package/dist/services/session/turn-attempt-factory.js

@@ -28,7 +28,7 @@ export class TurnAttemptFactory {
                 turn,
                 token,
                 initialRetryCounts: this.#normalizeRetryCounts(options.retries),
-                initialLedgerSnapshot: this.deps.toolTracker.export(),
+                initialJournalSnapshot: this.deps.journal.getEvents(),
                 maxTransientRetries: this.deps.resolveRetryLimit(),
                 maxModelRetries: options.maxModelRetries,
                 signal: options.signal,

package/dist/services/session/turn-attempt-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt-factory.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA4BhD,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE7D,MAAM,CAAC,KAAwB,EAAE,UAAiC,EAAE;QAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,IAAI,GAAa,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE;YAC5D,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE;YACvF,CAAC,CAAC,UAAU,CAAC;QAEf,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACxE,IAAI,CAAC;gBACH,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC7E,CAAC;YAAC,MAAM,CAAC;gBACP,sEAAsE;YACxE,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI,WAAW,CAAC;gBACvB,IAAI;gBACJ,KAAK;gBACL,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/D,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;gBACrD,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAClD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;gBAChC,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAA8B;QAC1C,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC9D,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,CAAC;IAED,qBAAqB,CAAC,OAAY;QAChC,MAAM,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;QAC1B,OAAO;YACL,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,IAAI,CAAC;YACjD,wBAAwB,EAAE,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC,4BAA4B,IAAI,CAAC;YAC/F,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,uBAAuB,IAAI,CAAC;YACxE,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC,2BAA2B,IAAI,CAAC;SAC7F,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"turn-attempt-factory.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6BhD,MAAM,OAAO,kBAAkB;IACA,IAAI;IAAjC,YAA6B,IAA4B;oBAA5B,IAAI;IAA2B,CAAC;IAE7D,MAAM,CAAC,KAAwB,EAAE,OAAO,GAA0B,EAAE;QAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,IAAI,GAAa,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE;YAC5D,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE;YACvF,CAAC,CAAC,UAAU,CAAC;QAEf,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACxE,IAAI,CAAC;gBACH,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC7E,CAAC;YAAC,MAAM,CAAC;gBACP,sEAAsE;YACxE,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI,WAAW,CAAC;gBACvB,IAAI;gBACJ,KAAK;gBACL,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/D,sBAAsB,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBACrD,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAClD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;gBAChC,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAA8B;QAC1C,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC9D,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,CAAC;IAED,qBAAqB,CAAC,OAAY;QAChC,MAAM,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;QAC1B,OAAO;YACL,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,IAAI,CAAC;YACjD,wBAAwB,EAAE,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC,4BAA4B,IAAI,CAAC;YAC/F,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,uBAAuB,IAAI,CAAC;YACxE,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC,2BAA2B,IAAI,CAAC;SAC7F,CAAC;IACJ,CAAC;CACF"}

package/dist/services/session/turn-attempt.d.ts

@@ -2,7 +2,7 @@ import type { AgentInputItem } from '@openai/agents';
 import type { AgentStream } from '../agent-stream.js';
 import type { UserTurn } from '../../types/user-turn.js';
 import type { RetryCounts } from '../retry/retry-contracts.js';
-import type { SavedToolExecution } from '../tool-execution-ledger.js';
+import type { AssistantJournalItemLogEvent } from '../logging/conversation-log-events.js';
 import type { SessionInputPlan } from './session-input-planner.js';
 import type { GenerationToken } from '../generation-guard.js';
 export declare class TurnAttempt {
@@ -11,7 +11,7 @@ export declare class TurnAttempt {
         turn: UserTurn;
         token: GenerationToken;
         initialRetryCounts: RetryCounts;
-        initialLedgerSnapshot: SavedToolExecution[];
+        initialJournalSnapshot: AssistantJournalItemLogEvent[];
         maxTransientRetries: number;
         maxModelRetries?: number;
         signal?: AbortSignal;
@@ -20,7 +20,7 @@ export declare class TurnAttempt {
     get turn(): UserTurn;
     get token(): GenerationToken;
     get initialRetryCounts(): RetryCounts;
-    get initialLedgerSnapshot(): SavedToolExecution[];
+    get initialJournalSnapshot(): AssistantJournalItemLogEvent[];
     get maxTransientRetries(): number;
     get maxModelRetries(): number | undefined;
     get retryCounts(): RetryCounts;

package/dist/services/session/turn-attempt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,WAAW;;gBAkBV,OAAO,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,kBAAkB,EAAE,WAAW,CAAC;QAChC,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;QAC5C,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;KACtB;IA0BD,IAAI,IAAI,IAAI,QAAQ,CAEnB;IAED,IAAI,KAAK,IAAI,eAAe,CAE3B;IAED,IAAI,kBAAkB,IAAI,WAAW,CAEpC;IAED,IAAI,qBAAqB,IAAI,kBAAkB,EAAE,CAEhD;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,IAAI,CAE/B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,SAAS,CAExE;IAED,IAAI,SAAS,IAAI,OAAO,GAAG,cAAc,GAAG,SAAS,CAEpD;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,oBAAoB,IAAI,IAAI;IAI5B,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAKzC,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI;IAI9C,YAAY,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI;IAI3C,KAAK,IAAI,IAAI;CAQd"}
+{"version":3,"file":"turn-attempt.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,WAAW;;IAkBtB,YAAY,OAAO,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,kBAAkB,EAAE,WAAW,CAAC;QAChC,sBAAsB,EAAE,4BAA4B,EAAE,CAAC;QACvD,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;KACtB,EAwBA;IAED,IAAI,IAAI,IAAI,QAAQ,CAEnB;IAED,IAAI,KAAK,IAAI,eAAe,CAE3B;IAED,IAAI,kBAAkB,IAAI,WAAW,CAEpC;IAED,IAAI,sBAAsB,IAAI,4BAA4B,EAAE,CAE3D;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,IAAI,CAE/B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,SAAS,CAExE;IAED,IAAI,SAAS,IAAI,OAAO,GAAG,cAAc,GAAG,SAAS,CAEpD;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAGxC;IAED,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAE7C;IAED,YAAY,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI,CAE1C;IAED,KAAK,IAAI,IAAI,CAOZ;CACF"}

package/dist/services/session/turn-attempt.js

@@ -2,7 +2,7 @@ export class TurnAttempt {
     #turn;
     #token;
     #initialRetryCounts;
-    #initialLedgerSnapshot;
+    #initialJournalSnapshot;
     #maxTransientRetries;
     #maxModelRetries;
     #retryCounts;
@@ -17,7 +17,7 @@ export class TurnAttempt {
         this.#turn = options.turn;
         this.#token = options.token;
         this.#initialRetryCounts = options.initialRetryCounts;
-        this.#initialLedgerSnapshot = options.initialLedgerSnapshot;
+        this.#initialJournalSnapshot = options.initialJournalSnapshot;
         this.#maxTransientRetries = options.maxTransientRetries;
         this.#maxModelRetries = options.maxModelRetries;
         this.#retryCounts = { ...options.initialRetryCounts };
@@ -46,8 +46,8 @@ export class TurnAttempt {
     get initialRetryCounts() {
         return this.#initialRetryCounts;
     }
-    get initialLedgerSnapshot() {
-        return this.#initialLedgerSnapshot;
+    get initialJournalSnapshot() {
+        return this.#initialJournalSnapshot;
     }
     get maxTransientRetries() {
         return this.#maxTransientRetries;

package/dist/services/session/turn-attempt.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-attempt.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-coordinator.d.ts

@@ -2,11 +2,13 @@ import type { ConversationEvent } from '../conversation/conversation-events.js';
 import { type UserTurn } from '../../types/user-turn.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
 import { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
-import type { TurnExecutor } from './turn-executor.js';
+import type { TurnWorkflow } from './turn-workflow.js';
 import type { ProviderContinuity } from '../provider-continuity.js';
+import type { InitialTurnRunOptions } from './turn-attempt-factory.js';
+export type TurnStartOptions = Pick<InitialTurnRunOptions, 'skipUserMessage' | 'replayFromHistory' | 'retries' | 'maxModelRetries' | 'signal' | 'resumeState' | 'resumePreviousResponseId' | 'bypassInputSurgeGuard'>;
 export interface TurnCoordinatorDeps {
     statusMachine: TurnStatusMachine;
-    turnExecutor: TurnExecutor;
+    turnWorkflow: TurnWorkflow;
     approvalFlow: ApprovalFlowCoordinator;
     providerContinuity: ProviderContinuity;
 }
@@ -14,16 +16,7 @@ export declare class TurnCoordinator {
     #private;
     private readonly deps;
     constructor(deps: TurnCoordinatorDeps);
-    start(input: string | UserTurn, options?: {
-        skipUserMessage?: boolean;
-        replayFromHistory?: boolean;
-        retries?: any;
-        maxModelRetries?: number;
-        signal?: AbortSignal;
-        resumeState?: any;
-        resumePreviousResponseId?: string | null;
-        bypassInputSurgeGuard?: boolean;
-    }): AsyncIterable<ConversationEvent>;
+    start(input: string | UserTurn, options?: TurnStartOptions): AsyncIterable<ConversationEvent>;
     continueAfterApproval({ answer, rejectionReason, }: {
         answer: string;
         rejectionReason?: string;

package/dist/services/session/turn-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAEnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,uBAAuB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;AAED,qBAAa,eAAe;;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,mBAAmB;IAE/C,KAAK,CACV,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,GAAE;QACP,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzC,qBAAqB,CAAC,EAAE,OAAO,CAAC;KAC5B,GACL,aAAa,CAAC,iBAAiB,CAAC;IA8C5B,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,GAChB,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,aAAa,CAAC,iBAAiB,CAAC;IAuCpC,KAAK,IAAI,IAAI;CAiBd"}
+{"version":3,"file":"turn-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,qBAAqB,EACnB,iBAAiB,GACjB,mBAAmB,GACnB,SAAS,GACT,iBAAiB,GACjB,QAAQ,GACR,aAAa,GACb,0BAA0B,GAC1B,uBAAuB,CAC1B,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,uBAAuB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;AAED,qBAAa,eAAe;;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,mBAAmB,EAAI;IAEnD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,gBAAqB,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAsBvG;IAEM,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,GAChB,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAkBnC;IAED,KAAK,IAAI,IAAI,CAIZ;CASF"}

package/dist/services/session/turn-coordinator.js

@@ -1,5 +1,4 @@
 import { toTerminalEvent } from '../conversation/conversation-result-builder.js';
-import { decideTurnTransition } from './turn-transition.js';
 export class TurnCoordinator {
     deps;
     constructor(deps) {
@@ -14,40 +13,17 @@ export class TurnCoordinator {
         // as a rejection reason used to continue the abandoned SDK run.
         this.deps.approvalFlow.getAbortedStatus();
         this.deps.statusMachine.beginTurn();
-        let finalState = 'streaming';
         let processed = false;
         try {
-            const turnOutcome = yield* this.deps.turnExecutor.executeInitial(input, {
-                skipUserMessage: options.skipUserMessage,
-                replayFromHistory: options.replayFromHistory,
-                resumeState: options.resumeState,
-                resumePreviousResponseId: options.resumePreviousResponseId,
-                retries: options.retries,
-                maxModelRetries: options.maxModelRetries,
-                signal: options.signal,
-                bypassInputSurgeGuard: options.bypassInputSurgeGuard,
-            });
+            const turnOutcome = yield* this.deps.turnWorkflow.executeInitial(input, options);
             processed = true;
-            // Use transition core to determine next state and command
-            const transition = decideTurnTransition('streaming', turnOutcome);
-            finalState = transition.next;
-            if (transition.command.kind === 'emit_terminal') {
-                yield toTerminalEvent(transition.command.terminal);
-            }
-            // 'none' command: no action needed (handled in finally)
+            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeOutcome(turnOutcome));
         }
         finally {
             if (!processed) {
                 // Error during initial run — reset status to idle
                 this.deps.statusMachine.complete();
             }
-            else if (finalState === 'awaiting_approval') {
-                this.deps.statusMachine.requestApproval();
-            }
-            else if (finalState === 'idle') {
-                this.deps.statusMachine.complete();
-            }
-            // 'streaming' (stale) leaves status untouched — same as current behavior
         }
     }
     async *continueAfterApproval({ answer, rejectionReason, }) {
@@ -55,38 +31,17 @@ export class TurnCoordinator {
             throw new Error('No pending approval to continue.');
         }
         this.deps.statusMachine.beginContinuation();
-        let finalState = 'continuing';
         let processed = false;
         try {
-            const pending = this.deps.approvalFlow.getPending();
-            const gen = pending?.token ?? 0;
-            const turnOutcome = yield* this.deps.turnExecutor.executeContinuation({
-                answer,
-                rejectionReason,
-                generation: gen,
-            });
-            const transition = decideTurnTransition('continuing', turnOutcome);
-            finalState = transition.next;
+            const turnOutcome = yield* this.deps.turnWorkflow.executeContinuation(this.deps.approvalFlow.buildApprovalDecision(answer, rejectionReason));
             processed = true;
-            yield* this.#executeTerminalCommand(transition.command);
+            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeContinuationOutcome(turnOutcome));
         }
         finally {
             if (!processed) {
                 // Error during continuation drive — reset status to idle
                 this.deps.statusMachine.complete();
             }
-            else if (this.deps.statusMachine.is('continuing') || this.deps.statusMachine.is('streaming')) {
-                // Only update status machine if external actions (e.g. abort during a
-                // stale drive) haven't already changed the state.
-                if (finalState === 'awaiting_approval') {
-                    this.deps.statusMachine.requestApproval();
-                }
-                else if (finalState === 'idle') {
-                    this.deps.statusMachine.complete();
-                }
-                // An unchanged active state means the result was stale; leave it alone.
-            }
-            // If an external action already changed the status, do nothing
         }
     }
     abort() {
@@ -98,10 +53,6 @@ export class TurnCoordinator {
     async *#executeTerminalCommand(command) {
         if (command.kind === 'emit_terminal') {
             yield toTerminalEvent(command.terminal);
-            return;
-        }
-        if (command.kind === 're_drive') {
-            throw new Error('re_drive must be executed before terminal command dispatch');
         }
     }
 }

package/dist/services/session/turn-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-coordinator.js","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-coordinator.js","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AA2BjF,MAAM,OAAO,eAAe;IACG,IAAI;IAAjC,YAA6B,IAAyB;oBAAzB,IAAI;IAAwB,CAAC;IAE1D,KAAK,CAAC,CAAC,KAAK,CAAC,KAAwB,EAAE,OAAO,GAAqB,EAAE;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,wEAAwE;QACxE,0EAA0E;QAC1E,gEAAgE;QAChE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACjF,SAAS,GAAG,IAAI,CAAC;YAEjB,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;QAC5F,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,kDAAkD;gBAClD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,CAAC,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,GAIhB;QACC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;QAC5C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CACnE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,CACtE,CAAC;YACF,SAAS,GAAG,IAAI,CAAC;YACjB,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC,CAAC;QACxG,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,yDAAyD;gBACzD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;IAED,gEAAgE;IAEhE,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAoB;QACjD,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACrC,MAAM,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF"}

package/dist/services/session/turn-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAE7F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,CACZ,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,EAAE,qBAAqB,GAC7B,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAExD,mBAAmB,CAAC,KAAK,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;CAC7G;AAED,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,yBAAyB,CAAC;CAC9C;AAED,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,uBAAuB;IAEnD,cAAc,CACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,GAAE,qBAA0B,GAClC,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC;IAmDhD,mBAAmB,CAAC,EACzB,MAAM,EACN,eAAe,EACf,UAAU,GACX,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC;CAyBpF"}
+{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAE7F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,CACZ,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,EAAE,qBAAqB,GAC7B,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAExD,mBAAmB,CAAC,KAAK,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;CAC7G;AAED,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,yBAAyB,CAAC;CAC9C;AAED,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,uBAAuB,EAAI;IAEvD,cAAc,CACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,GAAE,qBAA0B,GAClC,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAiDtD;IAEM,mBAAmB,CAAC,EACzB,MAAM,EACN,eAAe,EACf,UAAU,GACX,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAyBlF;CACF"}

package/dist/services/session/turn-executor.js

@@ -41,7 +41,7 @@ export class DefaultTurnExecutor {
             currentOptions = {
                 ...transition.command.options,
                 token: generation,
-                replayFromHistory: currentOptions.replayFromHistory,
+                replayFromHistory: true,
             };
         }
     }
@@ -62,6 +62,7 @@ export class DefaultTurnExecutor {
         return yield* this.executeInitial({ text: '' }, {
             ...transition.command.options,
             token: generation,
+            replayFromHistory: true,
         });
     }
 }

package/dist/services/session/turn-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-executor.js","sourceRoot":"","sources":["../../../source/services/session/turn-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-executor.js","sourceRoot":"","sources":["../../../source/services/session/turn-executor.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-item-accumulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-item-accumulator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-item-accumulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAEpG,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,YAAY,CAA8B;IAElD,kBAAkB,IAAI,IAAI;IAO1B,sBAAsB,IAAI,IAAI;IAO9B,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;IAMzE,oBAAoB,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI;IAMP,uBAAuB,IAAI,IAAI;IAO/B,YAAY,IAAI,0BAA0B,EAAE;IAI5C,eAAe,IAAI,eAAe,GAAG,SAAS;IAI9C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAI7C,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzC,kBAAkB,IAAI,OAAO;IAI7B,aAAa,IAAI,OAAO;CAGzB"}
+{"version":3,"file":"turn-item-accumulator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-item-accumulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAEpG,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,YAAY,CAA8B;IAElD,kBAAkB,IAAI,IAAI,CAKzB;IAED,sBAAsB,IAAI,IAAI,CAK7B;IAED,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAIxE;IAED,oBAAoB,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI,CAIN;IAED,uBAAuB,IAAI,IAAI,CAK9B;IAED,YAAY,IAAI,0BAA0B,EAAE,CAE3C;IAED,eAAe,IAAI,eAAe,GAAG,SAAS,CAE7C;IAED,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAE5C;IAED,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEnC;IAED,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAExC;IAED,kBAAkB,IAAI,OAAO,CAE5B;IAED,aAAa,IAAI,OAAO,CAEvB;CACF"}

package/dist/services/session/turn-status-machine.d.ts

@@ -1,4 +1,22 @@
+import type { ConversationTerminal } from '../../contracts/conversation.js';
 export type SessionStatus = 'idle' | 'streaming' | 'awaiting_approval' | 'continuing';
+export type TurnOutcome = {
+    kind: 'response';
+    terminal: ConversationTerminal;
+} | {
+    kind: 'approval_required';
+    terminal: ConversationTerminal;
+} | {
+    kind: 'stale';
+} | {
+    kind: 'failed';
+};
+export type TurnCommand = {
+    kind: 'emit_terminal';
+    terminal: ConversationTerminal;
+} | {
+    kind: 'none';
+};
 /**
  * Transition validator for turn status.
  *
@@ -21,5 +39,7 @@ export declare class TurnStatusMachine {
      */
     complete(): void;
     abort(): void;
+    completeOutcome(outcome: TurnOutcome): TurnCommand;
+    completeContinuationOutcome(outcome: TurnOutcome): TurnCommand;
 }
 //# sourceMappingURL=turn-status-machine.d.ts.map

package/dist/services/session/turn-status-machine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-status-machine.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-status-machine.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,mBAAmB,GAAG,YAAY,CAAC;AAEtF;;;;;GAKG;AACH,qBAAa,iBAAiB;;IAC5B,OAAO,CAAC,MAAM,CAAyB;IAEvC,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED,EAAE,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAIlC,SAAS,IAAI,IAAI;IAKjB,eAAe,IAAI,IAAI;IAOvB,iBAAiB,IAAI,IAAI;IAKzB;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAMhB,KAAK,IAAI,IAAI;CASd"}
+{"version":3,"file":"turn-status-machine.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-status-machine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,mBAAmB,GAAG,YAAY,CAAC;AAEtF,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,oBAAoB,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,oBAAoB,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvB,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,oBAAoB,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvG;;;;;GAKG;AACH,qBAAa,iBAAiB;;IAC5B,OAAO,CAAC,MAAM,CAAyB;IAEvC,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED,EAAE,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAEjC;IAED,SAAS,IAAI,IAAI,CAGhB;IAED,eAAe,IAAI,IAAI,CAKtB;IAED,iBAAiB,IAAI,IAAI,CAGxB;IAED;;;;;OAKG;IACH,QAAQ,IAAI,IAAI,CAIf;IAED,KAAK,IAAI,IAAI,CAEZ;IAED,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAcjD;IAED,2BAA2B,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAa7D;CAOF"}

package/dist/services/session/turn-status-machine.js

@@ -40,6 +40,34 @@ export class TurnStatusMachine {
     abort() {
         this.status = 'idle';
     }
+    completeOutcome(outcome) {
+        switch (outcome.kind) {
+            case 'response':
+                this.complete();
+                return { kind: 'emit_terminal', terminal: outcome.terminal };
+            case 'approval_required':
+                this.requestApproval();
+                return { kind: 'emit_terminal', terminal: outcome.terminal };
+            case 'stale':
+                return { kind: 'none' };
+            case 'failed':
+                this.complete();
+                return { kind: 'none' };
+        }
+    }
+    completeContinuationOutcome(outcome) {
+        if (this.status === 'continuing' || this.status === 'streaming') {
+            return this.completeOutcome(outcome);
+        }
+        switch (outcome.kind) {
+            case 'response':
+            case 'approval_required':
+                return { kind: 'emit_terminal', terminal: outcome.terminal };
+            case 'stale':
+            case 'failed':
+                return { kind: 'none' };
+        }
+    }
     #assertTransition(from, to) {
         if (this.status !== from) {
             throw new Error(`Invalid transition: ${this.status} -> ${to}`);

package/dist/services/session/turn-status-machine.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-status-machine.js","sourceRoot":"","sources":["../../../source/services/session/turn-status-machine.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,OAAO,iBAAiB;IACpB,MAAM,GAAkB,MAAM,CAAC;IAEvC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,EAAE,CAAC,MAAqB;QACtB,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;IAC5B,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC;IACpC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,iBAAiB,CAAC,IAAmB,EAAE,EAAiB;QACtD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,CAAC,MAAM,OAAO,EAAE,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"turn-status-machine.js","sourceRoot":"","sources":["../../../source/services/session/turn-status-machine.ts"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,MAAM,OAAO,iBAAiB;IACpB,MAAM,GAAkB,MAAM,CAAC;IAEvC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,EAAE,CAAC,MAAqB;QACtB,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;IAC5B,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC;IACpC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,eAAe,CAAC,OAAoB;QAClC,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,UAAU;gBACb,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC/D,KAAK,mBAAmB;gBACtB,IAAI,CAAC,eAAe,EAAE,CAAC;gBACvB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC/D,KAAK,OAAO;gBACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC1B,KAAK,QAAQ;gBACX,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,2BAA2B,CAAC,OAAoB;QAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QAED,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,UAAU,CAAC;YAChB,KAAK,mBAAmB;gBACtB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC/D,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,IAAmB,EAAE,EAAiB;QACtD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,CAAC,MAAM,OAAO,EAAE,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CACF"}

package/dist/services/session/turn-transition.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-transition.js","sourceRoot":"","sources":["../../../source/services/session/turn-transition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-transition.js","sourceRoot":"","sources":["../../../source/services/session/turn-transition.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-workflow.d.ts

@@ -0,0 +1,84 @@
+import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { ILoggingService } from '../service-interfaces.js';
+import type { SessionToolTracker } from './session-tool-tracker.js';
+import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { TurnItemAccumulator } from './turn-item-accumulator.js';
+import type { GenerationGuard } from '../generation-guard.js';
+import { TurnAttempt } from './turn-attempt.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { InitialTurnRunOptions, TurnAttemptFactory } from './turn-attempt-factory.js';
+import type { InitialInputPreparer } from './initial-input-preparer.js';
+import type { InitialTurnRecoveryHandler } from './initial-turn-recovery-handler.js';
+import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
+import type { TurnOutcome } from './turn-status-machine.js';
+import type { ConversationTerminal } from '../../contracts/conversation.js';
+import type { RetryCounts } from '../retry/retry-contracts.js';
+export type InternalTurnOutcome = {
+    kind: 'response';
+    terminal: ConversationTerminal;
+} | {
+    kind: 'approval_required';
+    terminal: ConversationTerminal;
+} | {
+    kind: 'stale';
+} | {
+    kind: 'failed';
+} | {
+    kind: 'fresh_start_required';
+    retryCounts: RetryCounts;
+    delayMs?: number;
+    useStandardServiceTier?: boolean;
+} | {
+    kind: 'abort_resolution_required';
+    abortedContext: AbortedApprovalContext;
+    userText: string;
+    generation: number;
+} | {
+    kind: 'auto_approval_required';
+    generation: number;
+    callId?: string;
+    command?: string;
+};
+import type { AbortedApprovalContext } from '../approval/approval-state.js';
+import type { ApprovalDecisionPolicy } from '../approval/approval-decision-policy.js';
+import type { ConversationStore } from '../conversation/conversation-store.js';
+import type { SessionInputPlanner } from './session-input-planner.js';
+import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
+import type { ContinuationPlanApplier } from './continuation-plan-applier.js';
+import type { ContinuationRecoveryHandler } from './continuation-recovery-handler.js';
+import { type ContinuationInit } from './continuation-state.js';
+import { ToolApprovalBatchCoordinator } from '../approval/tool-approval-batch-coordinator.js';
+import type { ProviderContinuity } from '../provider-continuity.js';
+import type { SessionStreamProcessor } from './session-stream-processor.js';
+export interface TurnWorkflowDeps {
+    agentClient: ConversationAgentClient;
+    logger: ILoggingService;
+    sessionId: string;
+    turnAccumulator: TurnItemAccumulator;
+    toolTracker: SessionToolTracker;
+    shellAutoApproval: ShellAutoApprovalResolver;
+    generationGuard: GenerationGuard;
+    attemptFactory: TurnAttemptFactory;
+    inputPreparer: InitialInputPreparer;
+    streamProcessor: SessionStreamProcessor;
+    recoveryHandler: InitialTurnRecoveryHandler;
+    journal: AssistantTurnJournal;
+    inputPlanner: SessionInputPlanner;
+    conversationStore: ConversationStore;
+    approvalFlow: ApprovalFlowCoordinator;
+    planApplier: ContinuationPlanApplier;
+    continuationRecoveryHandler: ContinuationRecoveryHandler;
+    providerContinuity: ProviderContinuity;
+    batchCoordinator?: ToolApprovalBatchCoordinator;
+}
+export declare class TurnWorkflow {
+    #private;
+    private readonly deps;
+    constructor(deps: TurnWorkflowDeps);
+    executeInitial(attemptOrInput: TurnAttempt | string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    executeContinuation(init: ContinuationInit, policy?: ApprovalDecisionPolicy): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    executeInitialAttempt(attemptOrInput: TurnAttempt | string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, InternalTurnOutcome, void>;
+    executeContinuationAttempt(init: ContinuationInit, policy?: ApprovalDecisionPolicy): AsyncGenerator<ConversationEvent, InternalTurnOutcome, void>;
+}
+//# sourceMappingURL=turn-workflow.d.ts.map

package/dist/services/session/turn-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-workflow.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-workflow.ts"],"names":[],"mappings":"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"}