@roackb2/heddle 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -1
- package/dist/src/cli/ask.d.ts +11 -1
- package/dist/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +168 -204
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/chat/App.js +7 -4
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.d.ts +5 -18
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.js +10 -122
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.d.ts +6 -6
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.js +12 -24
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.d.ts +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.js +10 -10
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.d.ts +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.js +34 -30
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.d.ts +3 -0
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.js +13 -12
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.d.ts +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.js +23 -23
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.d.ts +5 -2
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.js +21 -10
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.d.ts +2 -0
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.js +13 -23
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.js.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.d.ts +4 -3
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.js +10 -9
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.js.map +1 -1
- package/dist/src/cli/chat/hooks/useChatDrift.d.ts +4 -4
- package/dist/src/cli/chat/hooks/useChatDrift.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useChatDrift.js +7 -6
- package/dist/src/cli/chat/hooks/useChatDrift.js.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.d.ts +3 -0
- package/dist/src/cli/chat/hooks/useChatSessions.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.js +30 -23
- package/dist/src/cli/chat/hooks/useChatSessions.js.map +1 -1
- package/dist/src/cli/chat/submit.d.ts +3 -4
- package/dist/src/cli/chat/submit.d.ts.map +1 -1
- package/dist/src/cli/chat/submit.js +17 -55
- package/dist/src/cli/chat/submit.js.map +1 -1
- package/dist/src/cli/chat/utils/runtime.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/runtime.js.map +1 -1
- package/dist/src/cli/daemon.d.ts +2 -2
- package/dist/src/cli/daemon.d.ts.map +1 -1
- package/dist/src/cli/daemon.js +2 -2
- package/dist/src/cli/daemon.js.map +1 -1
- package/dist/src/cli/main.js +3 -3
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/remote/control-plane-client.d.ts +8 -4
- package/dist/src/cli/remote/control-plane-client.d.ts.map +1 -1
- package/dist/src/core/chat/engine/conversation-engine.d.ts.map +1 -1
- package/dist/src/core/chat/engine/conversation-engine.js +4 -8
- package/dist/src/core/chat/engine/conversation-engine.js.map +1 -1
- package/dist/src/core/chat/engine/index.d.ts +1 -1
- package/dist/src/core/chat/engine/index.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.d.ts +2 -1
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.js +8 -0
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.js.map +1 -1
- package/dist/src/core/chat/engine/sessions/service.d.ts +39 -5
- package/dist/src/core/chat/engine/sessions/service.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/service.js +246 -106
- package/dist/src/core/chat/engine/sessions/service.js.map +1 -1
- package/dist/src/core/chat/engine/sessions/session-record.d.ts +2 -1
- package/dist/src/core/chat/engine/sessions/session-record.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/session-record.js +1 -0
- package/dist/src/core/chat/engine/sessions/session-record.js.map +1 -1
- package/dist/src/core/chat/engine/turns/context.d.ts +2 -0
- package/dist/src/core/chat/engine/turns/context.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/context.js +2 -2
- package/dist/src/core/chat/engine/turns/context.js.map +1 -1
- package/dist/src/core/chat/engine/turns/run-conversation-turn.d.ts +10 -0
- package/dist/src/core/chat/engine/turns/run-conversation-turn.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/run-conversation-turn.js +10 -0
- package/dist/src/core/chat/engine/turns/run-conversation-turn.js.map +1 -1
- package/dist/src/core/chat/engine/turns/service.d.ts +9 -4
- package/dist/src/core/chat/engine/turns/service.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/service.js +29 -28
- package/dist/src/core/chat/engine/turns/service.js.map +1 -1
- package/dist/src/core/chat/engine/types.d.ts +48 -3
- package/dist/src/core/chat/engine/types.d.ts.map +1 -1
- package/dist/src/core/chat/types.d.ts +2 -0
- package/dist/src/core/chat/types.d.ts.map +1 -1
- package/dist/src/core/prompts/system-prompt.d.ts.map +1 -1
- package/dist/src/core/prompts/system-prompt.js +1 -0
- package/dist/src/core/prompts/system-prompt.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/server/app.js +3 -3
- package/dist/src/server/app.js.map +1 -1
- package/dist/src/server/features/control-plane/{services → controllers}/ask.d.ts +5 -1
- package/dist/src/server/features/control-plane/controllers/ask.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/ask.js +68 -0
- package/dist/src/server/features/control-plane/controllers/ask.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-events.d.ts +26 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-events.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-events.js +49 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-events.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-presenter.d.ts +12 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-presenter.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-presenter.js +181 -0
- package/dist/src/server/features/control-plane/controllers/chat-session-presenter.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-sessions-controller.d.ts +63 -0
- package/dist/src/server/features/control-plane/controllers/chat-sessions-controller.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-sessions-controller.js +285 -0
- package/dist/src/server/features/control-plane/controllers/chat-sessions-controller.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-turn-review-presenter.d.ts +13 -0
- package/dist/src/server/features/control-plane/controllers/chat-turn-review-presenter.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/chat-turn-review-presenter.js +196 -0
- package/dist/src/server/features/control-plane/controllers/chat-turn-review-presenter.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/control-plane-state.d.ts +7 -0
- package/dist/src/server/features/control-plane/controllers/control-plane-state.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/control-plane-state.js +64 -0
- package/dist/src/server/features/control-plane/controllers/control-plane-state.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/heartbeat.d.ts +12 -0
- package/dist/src/server/features/control-plane/controllers/heartbeat.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/heartbeat.js +59 -0
- package/dist/src/server/features/control-plane/controllers/heartbeat.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/layout-snapshots.d.ts +13 -0
- package/dist/src/server/features/control-plane/controllers/layout-snapshots.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/layout-snapshots.js +70 -0
- package/dist/src/server/features/control-plane/controllers/layout-snapshots.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/memory.d.ts +25 -0
- package/dist/src/server/features/control-plane/controllers/memory.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/memory.js +44 -0
- package/dist/src/server/features/control-plane/controllers/memory.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/workspace-diff.d.ts +18 -0
- package/dist/src/server/features/control-plane/controllers/workspace-diff.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/workspace-diff.js +260 -0
- package/dist/src/server/features/control-plane/controllers/workspace-diff.js.map +1 -0
- package/dist/src/server/features/control-plane/controllers/workspace-files.d.ts +38 -0
- package/dist/src/server/features/control-plane/controllers/workspace-files.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/controllers/workspace-files.js +139 -0
- package/dist/src/server/features/control-plane/controllers/workspace-files.js.map +1 -0
- package/dist/src/server/features/control-plane/helpers/read-values.d.ts +7 -0
- package/dist/src/server/features/control-plane/helpers/read-values.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/helpers/read-values.js +26 -0
- package/dist/src/server/features/control-plane/helpers/read-values.js.map +1 -0
- package/dist/src/server/features/control-plane/router.d.ts +8 -4
- package/dist/src/server/features/control-plane/router.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/router.js +59 -40
- package/dist/src/server/features/control-plane/router.js.map +1 -1
- package/dist/src/server/features/control-plane/types.d.ts +2 -0
- package/dist/src/server/features/control-plane/types.d.ts.map +1 -1
- package/dist/src/server/index.d.ts +1 -1
- package/dist/src/server/index.d.ts.map +1 -1
- package/dist/src/server/index.js +1 -1
- package/dist/src/server/index.js.map +1 -1
- package/dist/src/server/router.d.ts +8 -4
- package/dist/src/server/router.d.ts.map +1 -1
- package/dist/src/web/assets/{MonacoDiffViewer-vifX8i2F.js → MonacoDiffViewer-D0Ed6GCN.js} +1 -1
- package/dist/src/web/assets/{index-vEln1ViW.js → index-B_9nk8kS.js} +2 -2
- package/dist/src/web/index.html +1 -1
- package/package.json +6 -2
- package/dist/src/server/features/control-plane/services/ask.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/ask.js +0 -66
- package/dist/src/server/features/control-plane/services/ask.js.map +0 -1
- package/dist/src/server/features/control-plane/services/chat-session-events.d.ts +0 -26
- package/dist/src/server/features/control-plane/services/chat-session-events.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/chat-session-events.js +0 -61
- package/dist/src/server/features/control-plane/services/chat-session-events.js.map +0 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts +0 -59
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +0 -661
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +0 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.d.ts +0 -4
- package/dist/src/server/features/control-plane/services/control-plane-state.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.js +0 -56
- package/dist/src/server/features/control-plane/services/control-plane-state.js.map +0 -1
- package/dist/src/server/features/control-plane/services/heartbeat.d.ts +0 -9
- package/dist/src/server/features/control-plane/services/heartbeat.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/heartbeat.js +0 -57
- package/dist/src/server/features/control-plane/services/heartbeat.js.map +0 -1
- package/dist/src/server/features/control-plane/services/layout-snapshots.d.ts +0 -6
- package/dist/src/server/features/control-plane/services/layout-snapshots.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/layout-snapshots.js +0 -68
- package/dist/src/server/features/control-plane/services/layout-snapshots.js.map +0 -1
- package/dist/src/server/features/control-plane/services/memory.d.ts +0 -22
- package/dist/src/server/features/control-plane/services/memory.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/memory.js +0 -36
- package/dist/src/server/features/control-plane/services/memory.js.map +0 -1
- package/dist/src/server/features/control-plane/services/workspace-diff.d.ts +0 -4
- package/dist/src/server/features/control-plane/services/workspace-diff.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/workspace-diff.js +0 -258
- package/dist/src/server/features/control-plane/services/workspace-diff.js.map +0 -1
- package/dist/src/server/features/control-plane/services/workspace-files.d.ts +0 -27
- package/dist/src/server/features/control-plane/services/workspace-files.d.ts.map +0 -1
- package/dist/src/server/features/control-plane/services/workspace-files.js +0 -137
- package/dist/src/server/features/control-plane/services/workspace-files.js.map +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { RunResult } from '../../../../../index.js';
|
|
2
|
+
import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
|
|
2
3
|
import type { ChatSession } from '../../../state/types.js';
|
|
3
4
|
import type { ChatRuntimeConfig } from '../../../utils/runtime.js';
|
|
4
5
|
import { createTuiRememberedApprovalPolicies, createTuiToolApprovalPort } from './tui-tool-approval.js';
|
|
@@ -14,6 +15,8 @@ export declare function executeTuiOrdinaryTurn(args: {
|
|
|
14
15
|
sessionId: string;
|
|
15
16
|
runtime: ChatRuntimeConfig;
|
|
16
17
|
state: ActionState;
|
|
18
|
+
sessionService: ConversationSessionService;
|
|
19
|
+
refreshSessions: () => void;
|
|
17
20
|
updateSessionById: SessionUpdater;
|
|
18
21
|
parsePlanState: ParsePlanState;
|
|
19
22
|
maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-ordinary-turn.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAInE,OAAO,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAExH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,WAAW,CAAC;IACnB,iBAAiB,EAAE,cAAc,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;IAClG,uBAAuB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACpG,aAAa,EAAE,2BAA2B,GAAG,SAAS,CAAC;IACvD,eAAe,EAAE,WAAW,CAAC;IAC7B,UAAU,EAAE;QAAE,SAAS,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"tui-ordinary-turn.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAInE,OAAO,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAExH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,EAAE,cAAc,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;IAClG,uBAAuB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACpG,aAAa,EAAE,2BAA2B,GAAG,SAAS,CAAC;IACvD,eAAe,EAAE,WAAW,CAAC;IAC7B,UAAU,EAAE;QAAE,SAAS,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAuGjC"}
|
|
@@ -4,22 +4,22 @@ import { finalizeSuccessfulTuiOrdinaryTurn } from './tui-agent-turn-result.js';
|
|
|
4
4
|
import { createTuiRunLoopEventAdapter } from './tui-run-loop-events.js';
|
|
5
5
|
import { createTuiRememberedApprovalPolicies, createTuiToolApprovalPort } from './tui-tool-approval.js';
|
|
6
6
|
export async function executeTuiOrdinaryTurn(args) {
|
|
7
|
-
const { prompt, displayText, sessionId, runtime, state, updateSessionById, parsePlanState, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, driftObserver, turnAbortSignal, leaseOwner, } = args;
|
|
7
|
+
const { prompt, displayText, sessionId, runtime, state, sessionService, refreshSessions, updateSessionById, parsePlanState, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, driftObserver, turnAbortSignal, leaseOwner, } = args;
|
|
8
8
|
const compactionPort = createTuiCompactionStatusPort({
|
|
9
9
|
state,
|
|
10
10
|
sessionId,
|
|
11
|
-
|
|
11
|
+
sessionService,
|
|
12
|
+
refreshSessions,
|
|
12
13
|
});
|
|
13
14
|
if (displayText) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
messages: [...session.messages, { id: state.nextLocalId(), role: 'user', text: displayText }],
|
|
17
|
-
}));
|
|
15
|
+
sessionService.appendMessage(sessionId, { id: state.nextLocalId(), role: 'user', text: displayText });
|
|
16
|
+
refreshSessions();
|
|
18
17
|
}
|
|
19
18
|
const runLoopEvents = createTuiRunLoopEventAdapter({
|
|
20
19
|
state,
|
|
21
20
|
sessionId,
|
|
22
|
-
|
|
21
|
+
sessionService,
|
|
22
|
+
refreshSessions,
|
|
23
23
|
parsePlanState,
|
|
24
24
|
});
|
|
25
25
|
const approvalPort = createTuiToolApprovalPort({
|
|
@@ -27,6 +27,11 @@ export async function executeTuiOrdinaryTurn(args) {
|
|
|
27
27
|
rememberProjectApproval,
|
|
28
28
|
});
|
|
29
29
|
const approvalPolicies = createTuiRememberedApprovalPolicies({ isProjectApproved });
|
|
30
|
+
// Desired shape: ordinary TUI turns should call
|
|
31
|
+
// createConversationEngine(...).turns.submit after the shared turn service
|
|
32
|
+
// exposes every TUI-required control, especially shouldStop, streaming,
|
|
33
|
+
// trace events, compaction status, approval policy, and the updated session.
|
|
34
|
+
// Until then, this is the remaining lower-level turn boundary violation.
|
|
30
35
|
const result = await runConversationTurn({
|
|
31
36
|
workspaceRoot: runtime.workspaceRoot,
|
|
32
37
|
stateRoot: runtime.stateRoot,
|
|
@@ -59,11 +64,7 @@ export async function executeTuiOrdinaryTurn(args) {
|
|
|
59
64
|
if (!result) {
|
|
60
65
|
return undefined;
|
|
61
66
|
}
|
|
62
|
-
const
|
|
63
|
-
const persistedSession = readChatSession(runtime.sessionCatalogFile, sessionId, true);
|
|
64
|
-
if (!persistedSession) {
|
|
65
|
-
return undefined;
|
|
66
|
-
}
|
|
67
|
+
const persistedSession = sessionService.require(sessionId);
|
|
67
68
|
const { latestHistory } = finalizeSuccessfulTuiOrdinaryTurn({
|
|
68
69
|
persistedSession,
|
|
69
70
|
displayText,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-ordinary-turn.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"tui-ordinary-turn.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import type { TraceEvent } from '../../../../../index.js';
|
|
2
|
+
import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
|
|
2
3
|
import type { AgentLoopEvent } from '../../../../../core/runtime/events.js';
|
|
3
|
-
import type { ChatSession } from '../../../state/types.js';
|
|
4
4
|
import type { ActionState } from '../useAgentRunController.js';
|
|
5
5
|
export type TuiAssistantStreamUpdate = {
|
|
6
6
|
step: number;
|
|
7
7
|
text: string;
|
|
8
8
|
done: boolean;
|
|
9
9
|
};
|
|
10
|
-
type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
|
|
11
10
|
type PlanStateParser = (output: unknown) => ActionState extends {
|
|
12
11
|
setCurrentPlan: (value: infer T) => void;
|
|
13
12
|
} ? T : never;
|
|
14
13
|
export declare function createTuiRunLoopEventAdapter(args: {
|
|
15
14
|
state: ActionState;
|
|
16
15
|
sessionId: string;
|
|
17
|
-
|
|
16
|
+
sessionService: ConversationSessionService;
|
|
17
|
+
refreshSessions: () => void;
|
|
18
18
|
parsePlanState: PlanStateParser;
|
|
19
19
|
}): {
|
|
20
20
|
onAssistantStream(update: TuiAssistantStreamUpdate): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-run-loop-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"tui-run-loop-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,wBAAwB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAErF,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAEzH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,cAAc,EAAE,eAAe,CAAC;CACjC;8BAO6B,wBAAwB;4BAQ1B,cAAc;wBAalB,UAAU;EA+CjC"}
|
|
@@ -3,7 +3,7 @@ import { previewEditFileInput } from '../../../../../core/tools/toolkits/coding-
|
|
|
3
3
|
import { formatConversationActivityForTui } from '../../../adapters/conversation-activity-adapter.js';
|
|
4
4
|
import { formatEditPreviewHistoryMessage, formatPlanHistoryMessage } from '../../../utils/format.js';
|
|
5
5
|
export function createTuiRunLoopEventAdapter(args) {
|
|
6
|
-
const { state, sessionId,
|
|
6
|
+
const { state, sessionId, sessionService, refreshSessions, parsePlanState } = args;
|
|
7
7
|
const appendedEditPreviewIds = new Set();
|
|
8
8
|
const appendedPlanSteps = new Set();
|
|
9
9
|
const streamingBuffers = new Map();
|
|
@@ -34,17 +34,13 @@ export function createTuiRunLoopEventAdapter(args) {
|
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
appendedEditPreviewIds.add(event.call.id);
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
text: formatEditPreviewHistoryMessage(preview),
|
|
45
|
-
},
|
|
46
|
-
],
|
|
47
|
-
}));
|
|
37
|
+
appendAssistantMessage({
|
|
38
|
+
sessionService,
|
|
39
|
+
refreshSessions,
|
|
40
|
+
sessionId,
|
|
41
|
+
id: state.nextLocalId(),
|
|
42
|
+
text: formatEditPreviewHistoryMessage(preview),
|
|
43
|
+
});
|
|
48
44
|
});
|
|
49
45
|
}
|
|
50
46
|
if (event.type === 'tool.result' && event.tool === 'update_plan') {
|
|
@@ -53,17 +49,13 @@ export function createTuiRunLoopEventAdapter(args) {
|
|
|
53
49
|
const renderedPlan = formatPlanHistoryMessage(event.result.output);
|
|
54
50
|
if (renderedPlan) {
|
|
55
51
|
appendedPlanSteps.add(event.step);
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
text: renderedPlan,
|
|
64
|
-
},
|
|
65
|
-
],
|
|
66
|
-
}));
|
|
52
|
+
appendAssistantMessage({
|
|
53
|
+
sessionService,
|
|
54
|
+
refreshSessions,
|
|
55
|
+
sessionId,
|
|
56
|
+
id: state.nextLocalId(),
|
|
57
|
+
text: renderedPlan,
|
|
58
|
+
});
|
|
67
59
|
}
|
|
68
60
|
}
|
|
69
61
|
}
|
|
@@ -74,6 +66,14 @@ export function createTuiRunLoopEventAdapter(args) {
|
|
|
74
66
|
},
|
|
75
67
|
};
|
|
76
68
|
}
|
|
69
|
+
function appendAssistantMessage(args) {
|
|
70
|
+
args.sessionService.appendMessage(args.sessionId, {
|
|
71
|
+
id: args.id,
|
|
72
|
+
role: 'assistant',
|
|
73
|
+
text: args.text,
|
|
74
|
+
});
|
|
75
|
+
args.refreshSessions();
|
|
76
|
+
}
|
|
77
77
|
function appendLiveEvents(state, nextEvents) {
|
|
78
78
|
if (nextEvents.length === 0) {
|
|
79
79
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-run-loop-events.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tui-run-loop-events.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ import type { ReasoningEffort } from '../../../../core/llm/types.js';
|
|
|
5
5
|
import type { CyberLoopObserverAnnotation } from '../../../../index.js';
|
|
6
6
|
import type { EditFilePreview } from '../../../../core/tools/toolkits/coding-files/edit-file.js';
|
|
7
7
|
import type { PlanItem } from '../../../../core/tools/toolkits/internal/update-plan.js';
|
|
8
|
+
import type { ConversationSessionService } from '../../../../core/chat/engine/types.js';
|
|
8
9
|
import type { ApprovalChoice, ChatSession, LiveEvent, PendingApproval } from '../../state/types.js';
|
|
9
10
|
import type { ChatRuntimeConfig } from '../../utils/runtime.js';
|
|
10
11
|
type StateSetter<T> = (value: T | ((current: T) => T)) => void;
|
|
11
12
|
type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
|
|
12
|
-
type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
|
|
13
13
|
export type ActionState = {
|
|
14
14
|
isRunning: boolean;
|
|
15
15
|
nextLocalId: () => string;
|
|
@@ -40,6 +40,8 @@ type ExecuteTurnArgs = {
|
|
|
40
40
|
tools: ToolDefinition[];
|
|
41
41
|
logger: Logger;
|
|
42
42
|
state: ActionState;
|
|
43
|
+
sessionService: ConversationSessionService;
|
|
44
|
+
refreshSessions: () => void;
|
|
43
45
|
updateSessionById: SessionUpdater;
|
|
44
46
|
referenceAssistantText?: string;
|
|
45
47
|
maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
|
|
@@ -55,8 +57,9 @@ type UseAgentRunArgs = {
|
|
|
55
57
|
activeSessionId: string;
|
|
56
58
|
sessions: ChatSession[];
|
|
57
59
|
state: ActionState;
|
|
60
|
+
sessionService: ConversationSessionService;
|
|
61
|
+
refreshSessions: () => void;
|
|
58
62
|
updateSessionById: SessionUpdater;
|
|
59
|
-
updateActiveSession: ActiveSessionUpdater;
|
|
60
63
|
drift?: ChatDriftObserverOptions;
|
|
61
64
|
};
|
|
62
65
|
export type ChatDriftObserverOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentRunController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useAgentRunController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACzG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMrE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2DAA2D,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"useAgentRunController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useAgentRunController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useMemo } from 'react';
|
|
2
2
|
import { createLogger, createLlmAdapter, createDefaultAgentTools, } from '../../../../index.js';
|
|
3
3
|
import { formatMissingProviderCredentialMessage, hasProviderCredentialForModel, resolveApiKeyForModel, resolveProviderCredentialSourceForModel, } from '../../../../core/runtime/api-keys.js';
|
|
4
|
-
import { releaseSessionLease } from '../../../../core/chat/engine/sessions/lease.js';
|
|
5
4
|
import { generateSessionTitle } from '../../../../core/chat/engine/sessions/title.js';
|
|
6
5
|
import { isGenericSessionName } from '../../../../core/chat/engine/sessions/session-record.js';
|
|
7
6
|
import { normalizeSessionTitle } from '../../utils/format.js';
|
|
@@ -13,7 +12,7 @@ import { applyTuiAgentTurnFailure } from './run/tui-agent-turn-result.js';
|
|
|
13
12
|
import { executeTuiOrdinaryTurn } from './run/tui-ordinary-turn.js';
|
|
14
13
|
const PLAN_ITEM_STATUSES = new Set(['pending', 'in_progress', 'completed']);
|
|
15
14
|
export function useAgentRunController(args) {
|
|
16
|
-
const { runtime, activeModel, activeReasoningEffort, sessionTitleModel, activeSessionId, sessions, state,
|
|
15
|
+
const { runtime, activeModel, activeReasoningEffort, sessionTitleModel, activeSessionId, sessions, state, sessionService, refreshSessions, updateSessionById } = args;
|
|
17
16
|
const projectApprovals = useProjectApprovals(runtime.approvalsFile);
|
|
18
17
|
const activeApiKey = resolveApiKeyForModel(activeModel, runtime);
|
|
19
18
|
const titleApiKey = resolveApiKeyForModel(sessionTitleModel, runtime);
|
|
@@ -68,7 +67,10 @@ export function useAgentRunController(args) {
|
|
|
68
67
|
if (!title) {
|
|
69
68
|
return;
|
|
70
69
|
}
|
|
71
|
-
|
|
70
|
+
if (isGenericSessionName(sessionService.require(sessionId).name)) {
|
|
71
|
+
sessionService.rename(sessionId, title);
|
|
72
|
+
refreshSessions();
|
|
73
|
+
}
|
|
72
74
|
}
|
|
73
75
|
catch (titleError) {
|
|
74
76
|
logger.debug({ error: titleError instanceof Error ? titleError.message : String(titleError), sessionId }, 'Session auto-title failed');
|
|
@@ -88,6 +90,8 @@ export function useAgentRunController(args) {
|
|
|
88
90
|
tools,
|
|
89
91
|
logger,
|
|
90
92
|
state,
|
|
93
|
+
sessionService,
|
|
94
|
+
refreshSessions,
|
|
91
95
|
updateSessionById,
|
|
92
96
|
maybeAutoNameSession,
|
|
93
97
|
isProjectApproved: projectApprovals.isApproved,
|
|
@@ -104,7 +108,8 @@ export function useAgentRunController(args) {
|
|
|
104
108
|
runtime,
|
|
105
109
|
tools,
|
|
106
110
|
state,
|
|
107
|
-
|
|
111
|
+
sessionService,
|
|
112
|
+
refreshSessions,
|
|
108
113
|
maybeAutoNameSession,
|
|
109
114
|
isProjectApproved: projectApprovals.isApproved,
|
|
110
115
|
rememberProjectApproval: projectApprovals.rememberApproval,
|
|
@@ -116,7 +121,7 @@ export function useAgentRunController(args) {
|
|
|
116
121
|
};
|
|
117
122
|
}
|
|
118
123
|
export async function executeAgentTurn(args) {
|
|
119
|
-
const { prompt, displayText, sessionId, sessionHistory, runtime, llm, logger, state, updateSessionById, referenceAssistantText, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, drift, } = args;
|
|
124
|
+
const { prompt, displayText, sessionId, sessionHistory, runtime, llm, logger, state, sessionService, refreshSessions, updateSessionById, referenceAssistantText, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, drift, } = args;
|
|
120
125
|
if (!prompt || state.isRunning) {
|
|
121
126
|
return undefined;
|
|
122
127
|
}
|
|
@@ -126,7 +131,8 @@ export async function executeAgentTurn(args) {
|
|
|
126
131
|
return undefined;
|
|
127
132
|
}
|
|
128
133
|
const turnAbortController = beginTuiAgentTurn(state);
|
|
129
|
-
|
|
134
|
+
sessionService.setLastContinuePrompt(sessionId, prompt);
|
|
135
|
+
refreshSessions();
|
|
130
136
|
drift?.onRunStart?.();
|
|
131
137
|
const leaseOwner = {
|
|
132
138
|
ownerKind: 'tui',
|
|
@@ -149,6 +155,8 @@ export async function executeAgentTurn(args) {
|
|
|
149
155
|
sessionId,
|
|
150
156
|
runtime,
|
|
151
157
|
state,
|
|
158
|
+
sessionService,
|
|
159
|
+
refreshSessions,
|
|
152
160
|
updateSessionById,
|
|
153
161
|
parsePlanState: parsePlanStateFromToolResult,
|
|
154
162
|
maybeAutoNameSession,
|
|
@@ -169,12 +177,14 @@ export async function executeAgentTurn(args) {
|
|
|
169
177
|
model: llm.info?.model ?? runtime.model,
|
|
170
178
|
state,
|
|
171
179
|
sessionId,
|
|
172
|
-
|
|
180
|
+
sessionService,
|
|
181
|
+
refreshSessions,
|
|
173
182
|
});
|
|
174
183
|
return undefined;
|
|
175
184
|
}
|
|
176
185
|
finally {
|
|
177
|
-
|
|
186
|
+
sessionService.releaseLease(sessionId, leaseOwner);
|
|
187
|
+
refreshSessions();
|
|
178
188
|
finishTuiAgentTurn(state);
|
|
179
189
|
}
|
|
180
190
|
}
|
|
@@ -231,7 +241,7 @@ function parsePlanStateFromToolResult(output) {
|
|
|
231
241
|
};
|
|
232
242
|
}
|
|
233
243
|
async function runDirectShellAction(args) {
|
|
234
|
-
const { rawCommand, model, activeSessionId, activeSession, runtime, tools, state,
|
|
244
|
+
const { rawCommand, model, activeSessionId, activeSession, runtime, tools, state, sessionService, refreshSessions, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, } = args;
|
|
235
245
|
const command = rawCommand.trim();
|
|
236
246
|
if (!command || state.isRunning || !activeSession) {
|
|
237
247
|
return;
|
|
@@ -245,7 +255,8 @@ async function runDirectShellAction(args) {
|
|
|
245
255
|
runtime,
|
|
246
256
|
tools,
|
|
247
257
|
state,
|
|
248
|
-
|
|
258
|
+
sessionService,
|
|
259
|
+
refreshSessions,
|
|
249
260
|
maybeAutoNameSession,
|
|
250
261
|
isProjectApproved,
|
|
251
262
|
rememberProjectApproval,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentRunController.js","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useAgentRunController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAKhC,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EACL,sCAAsC,EACtC,6BAA6B,EAC7B,qBAAqB,EACrB,uCAAuC,GACxC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useAgentRunController.js","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useAgentRunController.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ export declare function useChatAppController({ runtime, setStatus, }: {
|
|
|
4
4
|
setStatus: (value: string) => void;
|
|
5
5
|
}): {
|
|
6
6
|
sessions: import("../../state/types.js").ChatSession[];
|
|
7
|
+
sessionService: import("../../../../core/chat/engine/sessions/service.js").FileConversationSessionService;
|
|
8
|
+
refreshSessions: () => void;
|
|
7
9
|
activeSessionId: string;
|
|
8
10
|
setActiveSessionId: import("react").Dispatch<import("react").SetStateAction<string>>;
|
|
9
11
|
activeSession: import("../../state/types.js").ChatSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChatAppController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useChatAppController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useChatAppController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useChatAppController.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,SAAS,GACV,EAAE;IACD,OAAO,EAAE,iBAAiB,CAAC;IAC3B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;;;;;;;;;;;2BAsEW,MAAM;;;;;;;8BAoBN,MAAM;;EAkIjB"}
|
|
@@ -2,12 +2,11 @@ import { useCallback, useEffect, useMemo, useRef } from 'react';
|
|
|
2
2
|
import { estimateBuiltInContextWindow } from '../../../../core/llm/openai-models.js';
|
|
3
3
|
import { credentialModeFromSource, resolveCompatibleActiveModel, resolveSystemSelectedModel, } from '../../../../core/llm/model-policy.js';
|
|
4
4
|
import { resolveNewSessionExecutionPreferences, resolveStoredSessionExecutionPreferences, } from '../../../../core/chat/engine/sessions/preferences/service.js';
|
|
5
|
-
import {
|
|
6
|
-
import { buildCompactionRunningContext, compactChatHistoryWithArchive, } from '../../state/compaction.js';
|
|
5
|
+
import { compactChatHistoryWithArchive } from '../../state/compaction.js';
|
|
7
6
|
import { useChatSessions } from '../useChatSessions.js';
|
|
8
7
|
import { resolveProviderCredentialSourceForModel, } from '../../utils/runtime.js';
|
|
9
8
|
export function useChatAppController({ runtime, setStatus, }) {
|
|
10
|
-
const { sessions, activeSessionId, setActiveSessionId, activeSession, recentSessions, listRecentSessionsMessage, updateSessionById, updateActiveSession, setSessionPreferences, createSession: createSessionWithDefaultModel, renameSession, removeSession, } = useChatSessions({
|
|
9
|
+
const { sessions, sessionService, refreshSessions, activeSessionId, setActiveSessionId, activeSession, recentSessions, listRecentSessionsMessage, updateSessionById, updateActiveSession, setSessionPreferences, createSession: createSessionWithDefaultModel, renameSession, removeSession, } = useChatSessions({
|
|
11
10
|
sessionCatalogFile: runtime.sessionCatalogFile,
|
|
12
11
|
apiKeyPresent: runtime.providerCredentialPresent,
|
|
13
12
|
defaultModel: runtime.model,
|
|
@@ -106,15 +105,8 @@ export function useChatAppController({ runtime, setStatus, }) {
|
|
|
106
105
|
const previousContext = activeSession.context;
|
|
107
106
|
const previousArchives = activeSession.archives;
|
|
108
107
|
setStatus('Compacting');
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
context: buildCompactionRunningContext({
|
|
112
|
-
history: session.history,
|
|
113
|
-
previous: session.context,
|
|
114
|
-
archiveCount: session.archives?.length,
|
|
115
|
-
currentSummaryPath: session.context?.currentSummaryPath,
|
|
116
|
-
}),
|
|
117
|
-
}));
|
|
108
|
+
sessionService.markCompactionRunning(sessionId, { sourceHistory: sessionHistory });
|
|
109
|
+
refreshSessions();
|
|
118
110
|
void compactChatHistoryWithArchive({
|
|
119
111
|
history: sessionHistory,
|
|
120
112
|
model: activeModel,
|
|
@@ -125,21 +117,16 @@ export function useChatAppController({ runtime, setStatus, }) {
|
|
|
125
117
|
summarizer: { credentialSource: runtime.providerCredentialSource },
|
|
126
118
|
})
|
|
127
119
|
.then((compacted) => {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
history: compacted.history,
|
|
131
|
-
context: compacted.context,
|
|
132
|
-
archives: compacted.archives,
|
|
133
|
-
messages: buildConversationMessages(compacted.history),
|
|
134
|
-
}));
|
|
120
|
+
sessionService.applyCompactionResult(sessionId, compacted);
|
|
121
|
+
refreshSessions();
|
|
135
122
|
setStatus('Idle');
|
|
136
123
|
})
|
|
137
124
|
.catch(() => {
|
|
138
|
-
|
|
139
|
-
...session,
|
|
125
|
+
sessionService.restoreCompactionState(sessionId, {
|
|
140
126
|
context: previousContext,
|
|
141
127
|
archives: previousArchives,
|
|
142
|
-
})
|
|
128
|
+
});
|
|
129
|
+
refreshSessions();
|
|
143
130
|
setStatus('Idle');
|
|
144
131
|
});
|
|
145
132
|
}, [
|
|
@@ -149,10 +136,13 @@ export function useChatAppController({ runtime, setStatus, }) {
|
|
|
149
136
|
runtime.stateRoot,
|
|
150
137
|
runtime.systemContext,
|
|
151
138
|
setStatus,
|
|
152
|
-
|
|
139
|
+
sessionService,
|
|
140
|
+
refreshSessions,
|
|
153
141
|
]);
|
|
154
142
|
return {
|
|
155
143
|
sessions,
|
|
144
|
+
sessionService,
|
|
145
|
+
refreshSessions,
|
|
156
146
|
activeSessionId,
|
|
157
147
|
setActiveSessionId,
|
|
158
148
|
activeSession,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChatAppController.js","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useChatAppController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,qCAAqC,EACrC,wCAAwC,GACzC,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useChatAppController.js","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/useChatAppController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { CredentialAwareModelOption } from '../../../../core/llm/model-policy.js';
|
|
2
2
|
import type { ReasoningEffort } from '../../../../core/llm/types.js';
|
|
3
|
+
import type { ConversationSessionService } from '../../../../core/chat/engine/types.js';
|
|
3
4
|
import type { ReasoningEffortPickerOption } from '../useChatPickers.js';
|
|
4
5
|
import type { ChatSession } from '../../state/types.js';
|
|
5
6
|
import type { ChatRuntimeConfig } from '../../utils/runtime.js';
|
|
6
|
-
type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
|
|
7
7
|
type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
|
|
8
|
-
export declare function usePromptSubmissionController({ runtime, activeModel, activeReasoningEffort, setActiveModel, setActiveReasoningEffort, sessions, recentSessions, activeSessionId, activeSession, apiKeyPresent, nextLocalId, setStatus, switchSession, closeSession,
|
|
8
|
+
export declare function usePromptSubmissionController({ runtime, activeModel, activeReasoningEffort, setActiveModel, setActiveReasoningEffort, sessions, recentSessions, activeSessionId, activeSession, apiKeyPresent, nextLocalId, setStatus, switchSession, closeSession, sessionService, refreshSessions, updateActiveSession, createSession, renameSession, listRecentSessionsMessage, driftEnabled, driftError, setDriftEnabled, executeTurn, executeDirectShellCommand, saveTuiSnapshotMessage, isRunning, pendingApproval, mentionableFiles, modelPicker, reasoningPicker, sessionPicker, fileMentionPicker, resetPickerIndexes, }: {
|
|
9
9
|
runtime: ChatRuntimeConfig;
|
|
10
10
|
activeModel: string;
|
|
11
11
|
activeReasoningEffort?: ReasoningEffort;
|
|
@@ -20,7 +20,8 @@ export declare function usePromptSubmissionController({ runtime, activeModel, ac
|
|
|
20
20
|
setStatus: (value: string) => void;
|
|
21
21
|
switchSession: (id: string) => void;
|
|
22
22
|
closeSession: (id: string) => void;
|
|
23
|
-
|
|
23
|
+
sessionService: ConversationSessionService;
|
|
24
|
+
refreshSessions: () => void;
|
|
24
25
|
updateActiveSession: ActiveSessionUpdater;
|
|
25
26
|
createSession: (name?: string) => ChatSession;
|
|
26
27
|
renameSession: (name: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePromptSubmissionController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/usePromptSubmissionController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"usePromptSubmissionController.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/chat/hooks/controllers/usePromptSubmissionController.ts"],"names":[],"mappings":"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"}
|