@antelopejs/dms-ai 0.1.4 → 0.1.5
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 +48 -29
- package/dist/channels/bridge.d.ts +2 -8
- package/dist/channels/bridge.js +26 -42
- package/dist/channels/bridge.js.map +1 -1
- package/dist/channels/channel-service.d.ts +2 -2
- package/dist/channels/channel-service.js +12 -31
- package/dist/channels/channel-service.js.map +1 -1
- package/dist/channels/registry.d.ts +2 -2
- package/dist/channels/registry.js +7 -7
- package/dist/channels/registry.js.map +1 -1
- package/dist/config.d.ts +1 -0
- package/dist/config.js +8 -1
- package/dist/config.js.map +1 -1
- package/dist/constants/channels.d.ts +5 -10
- package/dist/constants/channels.js +6 -10
- package/dist/constants/channels.js.map +1 -1
- package/dist/constants/sidecar.d.ts +2 -1
- package/dist/constants/sidecar.js +3 -2
- package/dist/constants/sidecar.js.map +1 -1
- package/dist/index.js +8 -0
- package/dist/index.js.map +1 -1
- package/dist/lifecycle/build-id.d.ts +1 -0
- package/dist/lifecycle/build-id.js +32 -0
- package/dist/lifecycle/build-id.js.map +1 -0
- package/dist/lifecycle/sidecar-socket.d.ts +1 -1
- package/dist/lifecycle/sidecar-socket.js +2 -2
- package/dist/lifecycle/sidecar-socket.js.map +1 -1
- package/dist/lifecycle/spawn-sidecar.d.ts +0 -1
- package/dist/lifecycle/spawn-sidecar.js +5 -27
- package/dist/lifecycle/spawn-sidecar.js.map +1 -1
- package/dist/routes/channels.d.ts +3 -3
- package/dist/routes/channels.js +11 -12
- package/dist/routes/channels.js.map +1 -1
- package/dist/routes/index.d.ts +0 -1
- package/dist/routes/index.js +0 -1
- package/dist/routes/index.js.map +1 -1
- package/frontend-vue/.prettierignore +3 -0
- package/frontend-vue/.prettierrc +10 -0
- package/frontend-vue/app/chat/components/ChatView.vue +582 -0
- package/frontend-vue/app/chat/components/ComposerInput.vue +742 -0
- package/frontend-vue/app/chat/components/ConnectionBanner.vue +105 -0
- package/frontend-vue/app/chat/components/ConversationDrawer.vue +266 -0
- package/frontend-vue/app/chat/components/MarkdownContent.vue +196 -0
- package/frontend-vue/app/chat/components/MessageList.vue +474 -0
- package/frontend-vue/app/chat/components/PermissionRequests.vue +323 -0
- package/frontend-vue/app/chat/components/QuestionPrompt.vue +275 -0
- package/frontend-vue/app/chat/components/QueuedMessages.vue +109 -0
- package/frontend-vue/app/chat/components/TodoList.vue +291 -0
- package/frontend-vue/app/chat/components/ToolCallEntry.vue +218 -0
- package/frontend-vue/app/chat/components/ToolCluster.vue +282 -0
- package/frontend-vue/app/chat/composables/useChatChannel.ts +116 -0
- package/frontend-vue/app/chat/composables/useConversation.ts +838 -0
- package/frontend-vue/app/chat/composables/useConversationId.ts +34 -0
- package/frontend-vue/app/chat/composables/useConversationList.ts +56 -0
- package/frontend-vue/app/chat/composables/usePermissionQueue.ts +59 -0
- package/frontend-vue/app/chat/composables/useQuestionQueue.ts +50 -0
- package/frontend-vue/app/chat/composables/useRunClock.ts +28 -0
- package/frontend-vue/app/chat/composables/useSettings.ts +67 -0
- package/frontend-vue/app/chat/constants/attachments.ts +16 -0
- package/frontend-vue/app/chat/constants/connection-banner.ts +7 -0
- package/frontend-vue/app/chat/constants/conversation-drawer.ts +13 -0
- package/frontend-vue/app/chat/constants/conversation.ts +75 -0
- package/frontend-vue/app/chat/constants/permissions.ts +50 -0
- package/frontend-vue/app/chat/constants/protocol.ts +48 -0
- package/frontend-vue/app/chat/constants/run-status.ts +50 -0
- package/frontend-vue/app/chat/constants/settings.ts +60 -0
- package/frontend-vue/app/chat/types/conversation.ts +87 -0
- package/frontend-vue/app/chat/types/permission.ts +7 -0
- package/frontend-vue/app/chat/types/question.ts +17 -0
- package/frontend-vue/app/chat/types/settings.ts +27 -0
- package/frontend-vue/app/chat/utils/attachments.ts +62 -0
- package/frontend-vue/app/chat/utils/format.ts +14 -0
- package/frontend-vue/app/chat/utils/ids.ts +34 -0
- package/frontend-vue/app/chat/utils/markdown.ts +188 -0
- package/frontend-vue/app/chat/utils/run-status.ts +90 -0
- package/frontend-vue/app/chat/utils/todos.ts +64 -0
- package/frontend-vue/app/chat/utils/tool-summary.ts +53 -0
- package/frontend-vue/app/components/ActivityView.vue +34 -34
- package/frontend-vue/app/components/ChatPanel.vue +276 -0
- package/frontend-vue/app/components/SettingsView.vue +120 -112
- package/frontend-vue/app/components/SkillsView.vue +55 -53
- package/frontend-vue/app/plugins/ai.client.ts +145 -129
- package/frontend-vue/app/runtime/assistant-session.ts +21 -0
- package/frontend-vue/app/runtime/backoff.ts +11 -14
- package/frontend-vue/app/runtime/channel-client.ts +130 -141
- package/frontend-vue/app/runtime/chat-transport.ts +25 -55
- package/frontend-vue/app/runtime/constants.ts +69 -59
- package/frontend-vue/app/runtime/current-page.ts +49 -15
- package/frontend-vue/app/runtime/event-stream.ts +35 -35
- package/frontend-vue/app/runtime/frame-router.ts +30 -0
- package/frontend-vue/app/runtime/header-action.ts +18 -18
- package/frontend-vue/app/runtime/host-commands.ts +57 -56
- package/frontend-vue/app/runtime/listeners.ts +31 -0
- package/frontend-vue/app/runtime/navigation-complete.ts +7 -7
- package/frontend-vue/app/runtime/overlay-prefs.ts +36 -36
- package/frontend-vue/app/runtime/panel-state.ts +88 -0
- package/frontend-vue/app/runtime/session-gate.ts +8 -8
- package/frontend-vue/app/runtime/shortcuts.ts +12 -12
- package/frontend-vue/app/runtime/sidecar-status.ts +61 -61
- package/frontend-vue/app/runtime/typed-message.ts +11 -0
- package/frontend-vue/dms.frontend.ts +12 -12
- package/frontend-vue/eslint.config.mjs +13 -13
- package/frontend-vue/package.json +11 -4
- package/frontend-vue/pnpm-lock.yaml +298 -96
- package/frontend-vue/tests/backoff.test.ts +26 -30
- package/frontend-vue/tests/channel-client.test.ts +187 -188
- package/frontend-vue/tests/chat/markdown.test.ts +271 -0
- package/frontend-vue/tests/chat/useChatChannel.test.ts +124 -0
- package/frontend-vue/tests/chat/useConversation.test.ts +283 -0
- package/frontend-vue/tests/chat-panel.test.ts +354 -0
- package/frontend-vue/tests/chat-transport.test.ts +84 -57
- package/frontend-vue/tests/host-commands.test.ts +126 -87
- package/frontend-vue/tests/navigation.test.ts +65 -34
- package/frontend-vue/tests/overlay-prefs.test.ts +49 -49
- package/frontend-vue/tests/panel-state.test.ts +58 -0
- package/frontend-vue/tests/session-gate.test.ts +33 -33
- package/frontend-vue/tests/sidecar-guest.test.ts +46 -46
- package/frontend-vue/tests/sidecar-status.test.ts +29 -29
- package/frontend-vue/tsconfig.chat.json +16 -0
- package/frontend-vue/vitest.config.ts +6 -4
- package/package.json +5 -5
- package/sidecar/dist/agent/effective-mode.d.ts +2 -2
- package/sidecar/dist/agent/effective-mode.js +1 -1
- package/sidecar/dist/agent/effective-mode.js.map +1 -1
- package/sidecar/dist/agent/host-context.js +7 -9
- package/sidecar/dist/agent/host-context.js.map +1 -1
- package/sidecar/dist/agent/permission-bus.d.ts +1 -1
- package/sidecar/dist/agent/permission-bus.js +2 -2
- package/sidecar/dist/agent/permission-bus.js.map +1 -1
- package/sidecar/dist/agent/provider.d.ts +2 -2
- package/sidecar/dist/agent/question-bus.d.ts +1 -1
- package/sidecar/dist/agent/question-bus.js +2 -2
- package/sidecar/dist/agent/question-bus.js.map +1 -1
- package/sidecar/dist/agent/runner.d.ts +2 -2
- package/sidecar/dist/agent/runner.js +24 -8
- package/sidecar/dist/agent/runner.js.map +1 -1
- package/sidecar/dist/agent/session.d.ts +2 -2
- package/sidecar/dist/agent/session.js +49 -9
- package/sidecar/dist/agent/session.js.map +1 -1
- package/sidecar/dist/agent/switching-runner.js +10 -5
- package/sidecar/dist/agent/switching-runner.js.map +1 -1
- package/sidecar/dist/agent/turn-end-reasons.d.ts +2 -0
- package/sidecar/dist/agent/turn-end-reasons.js +6 -1
- package/sidecar/dist/agent/turn-end-reasons.js.map +1 -1
- package/sidecar/dist/constants/agent.d.ts +4 -1
- package/sidecar/dist/constants/agent.js +4 -1
- package/sidecar/dist/constants/agent.js.map +1 -1
- package/sidecar/dist/constants/cli.d.ts +0 -1
- package/sidecar/dist/constants/cli.js +0 -1
- package/sidecar/dist/constants/cli.js.map +1 -1
- package/sidecar/dist/constants/codex.d.ts +5 -2
- package/sidecar/dist/constants/codex.js +5 -2
- package/sidecar/dist/constants/codex.js.map +1 -1
- package/sidecar/dist/constants/http.d.ts +0 -9
- package/sidecar/dist/constants/http.js +0 -19
- package/sidecar/dist/constants/http.js.map +1 -1
- package/sidecar/dist/constants/mcp.d.ts +1 -1
- package/sidecar/dist/constants/mcp.js +1 -1
- package/sidecar/dist/constants/mcp.js.map +1 -1
- package/sidecar/dist/constants/paths.d.ts +0 -1
- package/sidecar/dist/constants/paths.js +0 -1
- package/sidecar/dist/constants/paths.js.map +1 -1
- package/sidecar/dist/constants/ws.d.ts +3 -4
- package/sidecar/dist/constants/ws.js +3 -4
- package/sidecar/dist/constants/ws.js.map +1 -1
- package/sidecar/dist/index.d.ts +0 -1
- package/sidecar/dist/index.js +6 -10
- package/sidecar/dist/index.js.map +1 -1
- package/sidecar/dist/mcp/tools/find-pages-using.js +5 -10
- package/sidecar/dist/mcp/tools/find-pages-using.js.map +1 -1
- package/sidecar/dist/mcp/types.d.ts +1 -1
- package/sidecar/dist/pages/page-filepath.d.ts +4 -0
- package/sidecar/dist/pages/page-filepath.js +28 -0
- package/sidecar/dist/pages/page-filepath.js.map +1 -0
- package/sidecar/dist/prompts/agent.d.ts +1 -1
- package/sidecar/dist/prompts/agent.js +1 -1
- package/sidecar/dist/prompts/agent.js.map +1 -1
- package/sidecar/dist/protocol/events.js +2 -2
- package/sidecar/dist/protocol/events.js.map +1 -1
- package/sidecar/dist/protocol/messages.d.ts +4 -15
- package/sidecar/dist/protocol/messages.js +4 -11
- package/sidecar/dist/protocol/messages.js.map +1 -1
- package/sidecar/dist/providers/claude/config.d.ts +2 -2
- package/sidecar/dist/providers/claude/config.js +2 -2
- package/sidecar/dist/providers/claude/config.js.map +1 -1
- package/sidecar/dist/providers/claude/provider.js +1 -1
- package/sidecar/dist/providers/claude/provider.js.map +1 -1
- package/sidecar/dist/providers/codex/config.d.ts +3 -2
- package/sidecar/dist/providers/codex/config.js +3 -3
- package/sidecar/dist/providers/codex/config.js.map +1 -1
- package/sidecar/dist/providers/codex/process.js +107 -74
- package/sidecar/dist/providers/codex/process.js.map +1 -1
- package/sidecar/dist/providers/codex/provider.js +68 -31
- package/sidecar/dist/providers/codex/provider.js.map +1 -1
- package/sidecar/dist/providers/codex/skills.d.ts +1 -0
- package/sidecar/dist/providers/codex/skills.js +4 -1
- package/sidecar/dist/providers/codex/skills.js.map +1 -1
- package/sidecar/dist/providers/codex/stop.d.ts +4 -0
- package/sidecar/dist/providers/codex/stop.js +71 -0
- package/sidecar/dist/providers/codex/stop.js.map +1 -0
- package/sidecar/dist/server/{iframe-socket-registry.d.ts → chat-socket-registry.d.ts} +3 -2
- package/sidecar/dist/server/{iframe-socket-registry.js → chat-socket-registry.js} +4 -3
- package/sidecar/dist/server/chat-socket-registry.js.map +1 -0
- package/sidecar/dist/server/client-auth.js +2 -14
- package/sidecar/dist/server/client-auth.js.map +1 -1
- package/sidecar/dist/server/host-command-router.d.ts +5 -0
- package/sidecar/dist/server/host-command-router.js +4 -0
- package/sidecar/dist/server/host-command-router.js.map +1 -0
- package/sidecar/dist/server/host-socket-registry.d.ts +1 -1
- package/sidecar/dist/server/host-socket-registry.js +16 -13
- package/sidecar/dist/server/host-socket-registry.js.map +1 -1
- package/sidecar/dist/server/http.d.ts +0 -1
- package/sidecar/dist/server/http.js +1 -44
- package/sidecar/dist/server/http.js.map +1 -1
- package/sidecar/dist/server/routing.d.ts +5 -6
- package/sidecar/dist/server/routing.js +18 -28
- package/sidecar/dist/server/routing.js.map +1 -1
- package/sidecar/dist/server/ws.d.ts +2 -2
- package/sidecar/dist/server/ws.js +41 -39
- package/sidecar/dist/server/ws.js.map +1 -1
- package/sidecar/dist/state/host-state.d.ts +10 -2
- package/sidecar/dist/state/host-state.js +13 -3
- package/sidecar/dist/state/host-state.js.map +1 -1
- package/sidecar/dist/state/settings-store.js +2 -2
- package/sidecar/dist/state/settings-store.js.map +1 -1
- package/sidecar/dist/state/settings-types.d.ts +3 -3
- package/sidecar/dist/state/settings-types.js +1 -1
- package/sidecar/dist/state/settings-types.js.map +1 -1
- package/sidecar/package.json +3 -5
- package/dist/chatbox/passthrough.d.ts +0 -3
- package/dist/chatbox/passthrough.js +0 -53
- package/dist/chatbox/passthrough.js.map +0 -1
- package/dist/constants/chatbox.d.ts +0 -10
- package/dist/constants/chatbox.js +0 -35
- package/dist/constants/chatbox.js.map +0 -1
- package/dist/routes/chatbox.d.ts +0 -7
- package/dist/routes/chatbox.js +0 -47
- package/dist/routes/chatbox.js.map +0 -1
- package/frontend-vue/app/runtime/overlay.ts +0 -400
- package/frontend-vue/app/runtime/theme-bridge.ts +0 -189
- package/sidecar/chatbox/dist/assets/index-C8u7mkHn.css +0 -1
- package/sidecar/chatbox/dist/assets/index-tdZvY7ee.js +0 -52
- package/sidecar/chatbox/dist/index.html +0 -13
- package/sidecar/dist/server/iframe-socket-registry.js.map +0 -1
|
@@ -1,56 +1,56 @@
|
|
|
1
|
-
import { readFileSync } from
|
|
2
|
-
import { resolve } from
|
|
3
|
-
import ts from
|
|
4
|
-
import { nextTick, ref, type Ref } from
|
|
5
|
-
import { expect, it, vi } from
|
|
6
|
-
import { runWhenLoggedIn } from
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { resolve } from "node:path";
|
|
3
|
+
import ts from "typescript";
|
|
4
|
+
import { nextTick, ref, type Ref } from "vue";
|
|
5
|
+
import { expect, it, vi } from "vitest";
|
|
6
|
+
import { runWhenLoggedIn } from "../app/runtime/session-gate";
|
|
7
7
|
|
|
8
8
|
interface PluginExports {
|
|
9
|
-
default: (context: unknown) => void | Promise<void
|
|
9
|
+
default: (context: unknown) => void | Promise<void>;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
interface PluginHarness {
|
|
13
|
-
useAuthFetch: ReturnType<typeof vi.fn
|
|
14
|
-
run: () => void | Promise<void
|
|
13
|
+
useAuthFetch: ReturnType<typeof vi.fn>;
|
|
14
|
+
run: () => void | Promise<void>;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
const SESSION_GATE_MODULE =
|
|
18
|
-
const SIDECAR_STATUS_MODULE =
|
|
17
|
+
const SESSION_GATE_MODULE = "../runtime/session-gate";
|
|
18
|
+
const SIDECAR_STATUS_MODULE = "../runtime/sidecar-status";
|
|
19
19
|
|
|
20
20
|
// A first probe reporting "no assistant here" stops the startup right after the
|
|
21
21
|
// authenticated fetch, which is all these tests need to observe.
|
|
22
22
|
const silentController = {
|
|
23
23
|
createSidecarStatusController: () => ({ init: async () => false }),
|
|
24
|
-
}
|
|
24
|
+
};
|
|
25
25
|
|
|
26
26
|
function loadPlugin(loggedIn: Ref<boolean>): PluginHarness {
|
|
27
27
|
const source = readFileSync(
|
|
28
|
-
resolve(__dirname,
|
|
29
|
-
|
|
30
|
-
)
|
|
28
|
+
resolve(__dirname, "../app/plugins/ai.client.ts"),
|
|
29
|
+
"utf8",
|
|
30
|
+
);
|
|
31
31
|
const compiled = ts.transpileModule(
|
|
32
32
|
source
|
|
33
|
-
.replace(
|
|
34
|
-
.replace(
|
|
33
|
+
.replace("import.meta.env.DEV", "true")
|
|
34
|
+
.replace("import.meta.hot", "undefined"),
|
|
35
35
|
{ compilerOptions: { module: ts.ModuleKind.CommonJS } },
|
|
36
|
-
)
|
|
37
|
-
const exports = {} as PluginExports
|
|
38
|
-
const useAuthFetch = vi.fn(() => ({ $authFetch: vi.fn() }))
|
|
36
|
+
);
|
|
37
|
+
const exports = {} as PluginExports;
|
|
38
|
+
const useAuthFetch = vi.fn(() => ({ $authFetch: vi.fn() }));
|
|
39
39
|
const requireModule = (name: string) => {
|
|
40
|
-
if (name ===
|
|
41
|
-
return { defineDmsPlugin: (plugin: unknown) => plugin }
|
|
40
|
+
if (name === "#dms/frontend-module") {
|
|
41
|
+
return { defineDmsPlugin: (plugin: unknown) => plugin };
|
|
42
42
|
}
|
|
43
|
-
if (name === SESSION_GATE_MODULE) return { runWhenLoggedIn }
|
|
44
|
-
if (name === SIDECAR_STATUS_MODULE) return silentController
|
|
45
|
-
return {}
|
|
46
|
-
}
|
|
43
|
+
if (name === SESSION_GATE_MODULE) return { runWhenLoggedIn };
|
|
44
|
+
if (name === SIDECAR_STATUS_MODULE) return silentController;
|
|
45
|
+
return {};
|
|
46
|
+
};
|
|
47
47
|
new Function(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
"require",
|
|
49
|
+
"exports",
|
|
50
|
+
"useUserSession",
|
|
51
|
+
"useAuthFetch",
|
|
52
52
|
compiled.outputText,
|
|
53
|
-
)(requireModule, exports, () => ({ loggedIn }), useAuthFetch)
|
|
53
|
+
)(requireModule, exports, () => ({ loggedIn }), useAuthFetch);
|
|
54
54
|
return {
|
|
55
55
|
useAuthFetch,
|
|
56
56
|
run: () =>
|
|
@@ -58,22 +58,22 @@ function loadPlugin(loggedIn: Ref<boolean>): PluginHarness {
|
|
|
58
58
|
vueApp: { onUnmount: vi.fn() },
|
|
59
59
|
runWithContext: (callback: () => unknown) => callback(),
|
|
60
60
|
}),
|
|
61
|
-
}
|
|
61
|
+
};
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
it(
|
|
65
|
-
const plugin = loadPlugin(ref(false))
|
|
66
|
-
await plugin.run()
|
|
67
|
-
expect(plugin.useAuthFetch).not.toHaveBeenCalled()
|
|
68
|
-
})
|
|
64
|
+
it("does not invoke authenticated fetching or inject the assistant for a guest", async () => {
|
|
65
|
+
const plugin = loadPlugin(ref(false));
|
|
66
|
+
await plugin.run();
|
|
67
|
+
expect(plugin.useAuthFetch).not.toHaveBeenCalled();
|
|
68
|
+
});
|
|
69
69
|
|
|
70
|
-
it(
|
|
71
|
-
const loggedIn = ref(false)
|
|
72
|
-
const plugin = loadPlugin(loggedIn)
|
|
73
|
-
await plugin.run()
|
|
74
|
-
expect(plugin.useAuthFetch).not.toHaveBeenCalled()
|
|
70
|
+
it("starts the assistant when a guest signs in without reloading the page", async () => {
|
|
71
|
+
const loggedIn = ref(false);
|
|
72
|
+
const plugin = loadPlugin(loggedIn);
|
|
73
|
+
await plugin.run();
|
|
74
|
+
expect(plugin.useAuthFetch).not.toHaveBeenCalled();
|
|
75
75
|
|
|
76
|
-
loggedIn.value = true
|
|
77
|
-
await nextTick()
|
|
78
|
-
expect(plugin.useAuthFetch).toHaveBeenCalledTimes(1)
|
|
79
|
-
})
|
|
76
|
+
loggedIn.value = true;
|
|
77
|
+
await nextTick();
|
|
78
|
+
expect(plugin.useAuthFetch).toHaveBeenCalledTimes(1);
|
|
79
|
+
});
|
|
@@ -1,39 +1,39 @@
|
|
|
1
|
-
import { describe, expect, it, vi } from
|
|
2
|
-
import { createSidecarStatusController } from
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { createSidecarStatusController } from "../app/runtime/sidecar-status";
|
|
3
3
|
|
|
4
|
-
describe(
|
|
5
|
-
it(
|
|
4
|
+
describe("sidecar status", () => {
|
|
5
|
+
it("reports connected from the status alone, and keeps no port or credential", async () => {
|
|
6
6
|
const controller = createSidecarStatusController(async () => ({
|
|
7
7
|
isRunning: true,
|
|
8
|
-
}))
|
|
9
|
-
expect(await controller.init()).toBe(true)
|
|
10
|
-
expect(controller.getStatus()).toBe(
|
|
11
|
-
expect(Object.keys(controller)).not.toContain(
|
|
12
|
-
expect(Object.keys(controller)).not.toContain(
|
|
13
|
-
controller.dispose()
|
|
14
|
-
})
|
|
8
|
+
}));
|
|
9
|
+
expect(await controller.init()).toBe(true);
|
|
10
|
+
expect(controller.getStatus()).toBe("connected");
|
|
11
|
+
expect(Object.keys(controller)).not.toContain("getPort");
|
|
12
|
+
expect(Object.keys(controller)).not.toContain("getClientToken");
|
|
13
|
+
controller.dispose();
|
|
14
|
+
});
|
|
15
15
|
|
|
16
|
-
it(
|
|
16
|
+
it("re-probes when the channel drops, and reports connected once the sidecar answers", async () => {
|
|
17
17
|
const fetchInfo = vi
|
|
18
18
|
.fn()
|
|
19
19
|
.mockResolvedValueOnce({ isRunning: true })
|
|
20
|
-
.mockResolvedValueOnce({ isRunning: true })
|
|
21
|
-
const statuses: string[] = []
|
|
22
|
-
const controller = createSidecarStatusController(fetchInfo)
|
|
23
|
-
await controller.init()
|
|
24
|
-
controller.subscribe((status) => statuses.push(status))
|
|
25
|
-
controller.reportChannelDown()
|
|
26
|
-
await vi.waitFor(() => expect(statuses.at(-1)).toBe(
|
|
27
|
-
expect(statuses).toEqual([
|
|
28
|
-
expect(fetchInfo).toHaveBeenCalledTimes(2)
|
|
29
|
-
controller.dispose()
|
|
30
|
-
})
|
|
20
|
+
.mockResolvedValueOnce({ isRunning: true });
|
|
21
|
+
const statuses: string[] = [];
|
|
22
|
+
const controller = createSidecarStatusController(fetchInfo);
|
|
23
|
+
await controller.init();
|
|
24
|
+
controller.subscribe((status) => statuses.push(status));
|
|
25
|
+
controller.reportChannelDown();
|
|
26
|
+
await vi.waitFor(() => expect(statuses.at(-1)).toBe("connected"));
|
|
27
|
+
expect(statuses).toEqual(["connected", "reviving", "connected"]);
|
|
28
|
+
expect(fetchInfo).toHaveBeenCalledTimes(2);
|
|
29
|
+
controller.dispose();
|
|
30
|
+
});
|
|
31
31
|
|
|
32
|
-
it(
|
|
32
|
+
it("does not show the assistant when spawning is disabled", async () => {
|
|
33
33
|
const controller = createSidecarStatusController(async () => ({
|
|
34
34
|
disabled: true,
|
|
35
|
-
}))
|
|
36
|
-
expect(await controller.init()).toBe(false)
|
|
37
|
-
controller.dispose()
|
|
38
|
-
})
|
|
39
|
-
})
|
|
35
|
+
}));
|
|
36
|
+
expect(await controller.init()).toBe(false);
|
|
37
|
+
controller.dispose();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"compilerOptions": {
|
|
3
|
+
"target": "ESNext",
|
|
4
|
+
"module": "ESNext",
|
|
5
|
+
"moduleResolution": "Bundler",
|
|
6
|
+
"lib": ["ESNext", "DOM", "DOM.Iterable"],
|
|
7
|
+
"strict": true,
|
|
8
|
+
"noUnusedLocals": true,
|
|
9
|
+
"noUnusedParameters": true,
|
|
10
|
+
"isolatedModules": true,
|
|
11
|
+
"skipLibCheck": true,
|
|
12
|
+
"noEmit": true,
|
|
13
|
+
"types": []
|
|
14
|
+
},
|
|
15
|
+
"include": ["app/chat/**/*.ts", "app/chat/**/*.vue", "tests/chat/**/*.ts"]
|
|
16
|
+
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import vue from "@vitejs/plugin-vue";
|
|
2
|
+
import { defineConfig } from "vitest/config";
|
|
2
3
|
|
|
3
4
|
export default defineConfig({
|
|
5
|
+
plugins: [vue()],
|
|
4
6
|
test: {
|
|
5
|
-
environment:
|
|
6
|
-
include: [
|
|
7
|
+
environment: "jsdom",
|
|
8
|
+
include: ["tests/**/*.test.ts"],
|
|
7
9
|
},
|
|
8
|
-
})
|
|
10
|
+
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-ai",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.5",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -11,7 +11,6 @@
|
|
|
11
11
|
"frontend-vue",
|
|
12
12
|
"skills",
|
|
13
13
|
"sidecar/dist",
|
|
14
|
-
"sidecar/chatbox/dist",
|
|
15
14
|
"sidecar/package.json"
|
|
16
15
|
],
|
|
17
16
|
"main": "dist/index.js",
|
|
@@ -30,21 +29,22 @@
|
|
|
30
29
|
},
|
|
31
30
|
"scripts": {
|
|
32
31
|
"build": "rimraf dist && tsc",
|
|
33
|
-
"build:sidecar": "cd sidecar && pnpm install && pnpm run build
|
|
32
|
+
"build:sidecar": "cd sidecar && pnpm install && pnpm run build",
|
|
34
33
|
"prepack": "pnpm run build && pnpm run build:sidecar",
|
|
35
34
|
"frontend:dev": "cd playground && pnpm frontend:dev",
|
|
36
35
|
"dev": "cd playground && pnpm dev",
|
|
37
36
|
"lint": "oxlint --disable-nested-config && oxfmt --disable-nested-config --check . && cd frontend-vue && pnpm lint && cd ../sidecar && pnpm lint && antelopejs-check-interface-ranges",
|
|
38
37
|
"lint:fix": "oxlint --disable-nested-config --fix --max-warnings=1000000 && oxfmt --disable-nested-config . && cd frontend-vue && pnpm lint:fix && cd ../sidecar && pnpm lint:fix",
|
|
39
|
-
"typecheck": "tsc --noEmit && cd frontend-vue && pnpm typecheck && cd ../sidecar && pnpm typecheck",
|
|
38
|
+
"typecheck": "tsc --noEmit && cd frontend-vue && pnpm typecheck:chat && pnpm typecheck && cd ../sidecar && pnpm typecheck",
|
|
40
39
|
"test": "cd sidecar && pnpm test && cd ../frontend-vue && pnpm test",
|
|
41
40
|
"test:sidecar-smoke": "pnpm run build:sidecar && node --test tests/sidecar-build.test.cjs",
|
|
42
41
|
"test:frontend-registration": "pnpm run build && node --test tests/frontend-registration.test.cjs",
|
|
43
42
|
"test:channels": "pnpm run build && node --test tests/channels.test.cjs tests/channel-limits.test.cjs",
|
|
44
43
|
"test:spawn-args": "node --test tests/spawn-args.test.cjs",
|
|
44
|
+
"test:build-id": "node --test tests/build-id.test.cjs",
|
|
45
45
|
"test:release-script": "node --test tests/release-script.test.cjs",
|
|
46
46
|
"test:e2e": "cd sidecar && pnpm test:e2e",
|
|
47
|
-
"release": "pnpm --dir frontend-vue install --frozen-lockfile && pnpm --dir sidecar install --frozen-lockfile &&
|
|
47
|
+
"release": "pnpm --dir frontend-vue install --frozen-lockfile && pnpm --dir sidecar install --frozen-lockfile && release-it",
|
|
48
48
|
"format": "oxfmt --disable-nested-config . && cd frontend-vue && pnpm format",
|
|
49
49
|
"knip": "knip --dependencies",
|
|
50
50
|
"knip:all": "knip"
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { AppSettings,
|
|
2
|
-
export declare function
|
|
1
|
+
import type { AppSettings, ChatMode } from "../state/settings-types.js";
|
|
2
|
+
export declare function effectiveChatMode(settings: AppSettings): ChatMode;
|
|
@@ -13,7 +13,7 @@ const MODE_IN_FORCE = {
|
|
|
13
13
|
auto: "auto",
|
|
14
14
|
},
|
|
15
15
|
};
|
|
16
|
-
export function
|
|
16
|
+
export function effectiveChatMode(settings) {
|
|
17
17
|
const generationMode = effectiveGenerationMode(settings.generationMode);
|
|
18
18
|
return MODE_IN_FORCE[generationMode][settings.mode];
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effective-mode.js","sourceRoot":"","sources":["../../src/agent/effective-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAOnE,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"effective-mode.js","sourceRoot":"","sources":["../../src/agent/effective-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAOnE,MAAM,aAAa,GAAuD;IACxE,IAAI,EAAE;QACJ,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,aAAa;KACpB;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;KACb;CACF,CAAC;AASF,MAAM,UAAU,iBAAiB,CAAC,QAAqB;IACrD,MAAM,cAAc,GAAG,uBAAuB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACxE,OAAO,aAAa,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import { HOST_CONTEXT_CLOSE, HOST_CONTEXT_FILE_LABEL, HOST_CONTEXT_MODE_LABEL, HOST_CONTEXT_OPEN, HOST_CONTEXT_PAGE_LABEL, HOST_CONTEXT_TITLE_LABEL, } from "../constants/agent.js";
|
|
1
|
+
import { HOST_CONTEXT_CLOSE, HOST_CONTEXT_FILE_LABEL, HOST_CONTEXT_MODE_LABEL, HOST_CONTEXT_OPEN, HOST_CONTEXT_PAGE_LABEL, HOST_CONTEXT_TITLE_LABEL, HOST_CONTEXT_UNKNOWN_VALUE, } from "../constants/agent.js";
|
|
2
2
|
export function formatHostContext(page, mode) {
|
|
3
|
-
const lines = [
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}
|
|
10
|
-
lines.push(`${HOST_CONTEXT_MODE_LABEL}${mode}`);
|
|
3
|
+
const lines = [
|
|
4
|
+
`${HOST_CONTEXT_PAGE_LABEL}${page.path}`,
|
|
5
|
+
`${HOST_CONTEXT_TITLE_LABEL}${page.title ?? HOST_CONTEXT_UNKNOWN_VALUE}`,
|
|
6
|
+
`${HOST_CONTEXT_FILE_LABEL}${page.filepath ?? HOST_CONTEXT_UNKNOWN_VALUE}`,
|
|
7
|
+
`${HOST_CONTEXT_MODE_LABEL}${mode}`,
|
|
8
|
+
];
|
|
11
9
|
return `${HOST_CONTEXT_OPEN}\n${lines.join("\n")}\n${HOST_CONTEXT_CLOSE}`;
|
|
12
10
|
}
|
|
13
11
|
export function prependHostContext(message, page, mode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-context.js","sourceRoot":"","sources":["../../src/agent/host-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"host-context.js","sourceRoot":"","sources":["../../src/agent/host-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAI/B,MAAM,UAAU,iBAAiB,CAC/B,IAAiB,EACjB,IAAoB;IAEpB,MAAM,KAAK,GAAG;QACZ,GAAG,uBAAuB,GAAG,IAAI,CAAC,IAAI,EAAE;QACxC,GAAG,wBAAwB,GAAG,IAAI,CAAC,KAAK,IAAI,0BAA0B,EAAE;QACxE,GAAG,uBAAuB,GAAG,IAAI,CAAC,QAAQ,IAAI,0BAA0B,EAAE;QAC1E,GAAG,uBAAuB,GAAG,IAAI,EAAE;KACpC,CAAC;IACF,OAAO,GAAG,iBAAiB,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,kBAAkB,EAAE,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,IAAiB,EACjB,IAAoB;IAEpB,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC;AAC1D,CAAC"}
|
|
@@ -72,7 +72,7 @@ function startRequest(state, req) {
|
|
|
72
72
|
}
|
|
73
73
|
return new Promise((resolve) => {
|
|
74
74
|
const event = registerPending(state, req, resolve);
|
|
75
|
-
state.
|
|
75
|
+
state.onPromptChat(event);
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
function handleResolve(state, requestId, decision) {
|
|
@@ -106,7 +106,7 @@ function buildState(opts) {
|
|
|
106
106
|
sessionAllowed: new Map(),
|
|
107
107
|
timeoutMs: opts.timeoutMs ?? PERMISSION_TIMEOUT_MS,
|
|
108
108
|
autoApprove: false,
|
|
109
|
-
|
|
109
|
+
onPromptChat: opts.onPromptChat,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
112
|
export function createPermissionBus(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-bus.js","sourceRoot":"","sources":["../../src/agent/permission-bus.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"permission-bus.js","sourceRoot":"","sources":["../../src/agent/permission-bus.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import type { CurrentPage } from "../state/host-state.js";
|
|
|
6
6
|
import type { AppSettings } from "../state/settings-types.js";
|
|
7
7
|
import type { TokenUsage } from "../state/types.js";
|
|
8
8
|
import type { PermissionBus } from "./permission-bus.js";
|
|
9
|
-
import type { RunnerEvent } from "./runner-events.js";
|
|
9
|
+
import type { RunnerError, RunnerEvent } from "./runner-events.js";
|
|
10
10
|
export interface TurnInput {
|
|
11
11
|
text: string;
|
|
12
12
|
attachments: readonly AttachmentType[];
|
|
@@ -25,7 +25,7 @@ export interface ProviderSessionContext {
|
|
|
25
25
|
export interface ProviderSession {
|
|
26
26
|
runTurn(input: TurnInput, settings: AppSettings): AsyncIterable<RunnerEvent>;
|
|
27
27
|
interrupt(): void;
|
|
28
|
-
dispose(): Promise<void>;
|
|
28
|
+
dispose(reason?: RunnerError): Promise<void>;
|
|
29
29
|
applySettings?(settings: AppSettings): void;
|
|
30
30
|
}
|
|
31
31
|
export interface AgentProvider {
|
|
@@ -10,7 +10,7 @@ export interface PendingQuestion {
|
|
|
10
10
|
questions: QuestionType[];
|
|
11
11
|
}
|
|
12
12
|
export interface QuestionBusOptions {
|
|
13
|
-
|
|
13
|
+
onPromptChat: (event: PendingQuestion) => void;
|
|
14
14
|
timeoutMs?: number;
|
|
15
15
|
}
|
|
16
16
|
export interface QuestionBus {
|
|
@@ -37,7 +37,7 @@ function registerPending(state, req, resolve) {
|
|
|
37
37
|
function startRequest(state, req) {
|
|
38
38
|
return new Promise((resolve) => {
|
|
39
39
|
const event = registerPending(state, req, resolve);
|
|
40
|
-
state.
|
|
40
|
+
state.onPromptChat(event);
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
function handleResolve(state, requestId, answers) {
|
|
@@ -68,7 +68,7 @@ function buildState(opts) {
|
|
|
68
68
|
return {
|
|
69
69
|
pending: new Map(),
|
|
70
70
|
timeoutMs: opts.timeoutMs ?? QUESTION_TIMEOUT_MS,
|
|
71
|
-
|
|
71
|
+
onPromptChat: opts.onPromptChat,
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
74
|
export function createQuestionBus(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question-bus.js","sourceRoot":"","sources":["../../src/agent/question-bus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,+BAA+B,GAChC,MAAM,2BAA2B,CAAC;AAiDnC,SAAS,iBAAiB,CAAC,OAAqB;IAC9C,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,KAAe,EACf,OAAqB,EACrB,OAAwB;IAExB,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,eAAe,CACtB,KAAe,EACf,SAAiB;IAEjB,OAAO,UAAU,CAAC,GAAG,EAAE;QACrB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,OAAO,CAAC,IAAI,CACV,GAAG,mBAAmB,IAAI,uBAAuB,eAAe,SAAS,GAAG,CAC7E,CAAC;QACF,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,eAAe,CACtB,KAAe,EACf,GAAoB,EACpB,OAA2C;IAE3C,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,OAAO,GAAiB;QAC5B,SAAS;QACT,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,OAAO;QACP,KAAK;KACN,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,YAAY,CACnB,KAAe,EACf,GAAoB;IAEpB,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,EAAE;QAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"question-bus.js","sourceRoot":"","sources":["../../src/agent/question-bus.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import type { AppSettings } from "../state/settings-types.js";
|
|
|
6
6
|
import type { TokenUsage } from "../state/types.js";
|
|
7
7
|
import type { PermissionBus } from "./permission-bus.js";
|
|
8
8
|
import type { AgentProvider } from "./provider.js";
|
|
9
|
-
import type { RunnerEvent } from "./runner-events.js";
|
|
9
|
+
import type { RunnerError, RunnerEvent } from "./runner-events.js";
|
|
10
10
|
export interface RunnerContext {
|
|
11
11
|
conversationId: string;
|
|
12
12
|
hostProjectRoot: string;
|
|
@@ -22,7 +22,7 @@ export interface AgentRunner {
|
|
|
22
22
|
interruptSession(conversationId: string): void;
|
|
23
23
|
disposeSession(conversationId: string): Promise<void>;
|
|
24
24
|
applySettings(settings: AppSettings): void;
|
|
25
|
-
dispose(): Promise<void>;
|
|
25
|
+
dispose(reason?: RunnerError): Promise<void>;
|
|
26
26
|
}
|
|
27
27
|
export interface AgentRunnerOptions {
|
|
28
28
|
settings?: AppSettings;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { effectiveGenerationMode } from "../builder/capability.js";
|
|
2
|
+
import { RUNNER_CLOSED_MESSAGE } from "../constants/agent.js";
|
|
2
3
|
import { DEFAULT_SETTINGS } from "../constants/settings.js";
|
|
3
4
|
import { createDisposalTracker } from "./disposals.js";
|
|
4
5
|
import { prependHostContext } from "./host-context.js";
|
|
@@ -18,14 +19,26 @@ function createSession(manager, ctx) {
|
|
|
18
19
|
},
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (existing !== undefined)
|
|
24
|
-
return existing;
|
|
22
|
+
function ignoreOutcome() { }
|
|
23
|
+
async function openSession(manager, ctx) {
|
|
25
24
|
const session = await createSession(manager, ctx);
|
|
25
|
+
if (manager.isClosed) {
|
|
26
|
+
await session.dispose();
|
|
27
|
+
throw new Error(RUNNER_CLOSED_MESSAGE);
|
|
28
|
+
}
|
|
26
29
|
manager.sessions.set(ctx.conversationId, session);
|
|
27
30
|
return session;
|
|
28
31
|
}
|
|
32
|
+
function getOrCreateSession(manager, ctx) {
|
|
33
|
+
const existing = manager.sessions.get(ctx.conversationId);
|
|
34
|
+
if (existing !== undefined)
|
|
35
|
+
return Promise.resolve(existing);
|
|
36
|
+
if (manager.isClosed)
|
|
37
|
+
return Promise.reject(new Error(RUNNER_CLOSED_MESSAGE));
|
|
38
|
+
const opening = openSession(manager, ctx);
|
|
39
|
+
manager.disposals.track(opening.then(ignoreOutcome, ignoreOutcome));
|
|
40
|
+
return opening;
|
|
41
|
+
}
|
|
29
42
|
async function* startTurn(manager, message, ctx) {
|
|
30
43
|
const session = await getOrCreateSession(manager, ctx);
|
|
31
44
|
const grounded = prependHostContext(message, ctx.getCurrentPage(), effectiveGenerationMode(manager.settings.generationMode));
|
|
@@ -46,11 +59,13 @@ function disposeSession(manager, conversationId) {
|
|
|
46
59
|
manager.disposals.track(disposal);
|
|
47
60
|
return disposal;
|
|
48
61
|
}
|
|
49
|
-
async function disposeAll(manager) {
|
|
62
|
+
async function disposeAll(manager, reason) {
|
|
63
|
+
manager.isClosed = true;
|
|
50
64
|
const sessions = [...manager.sessions.values()];
|
|
51
65
|
manager.sessions.clear();
|
|
52
|
-
for (const session of sessions)
|
|
53
|
-
manager.disposals.track(session.dispose());
|
|
66
|
+
for (const session of sessions) {
|
|
67
|
+
manager.disposals.track(session.dispose(reason));
|
|
68
|
+
}
|
|
54
69
|
await manager.disposals.settle();
|
|
55
70
|
}
|
|
56
71
|
function applySettings(manager, settings) {
|
|
@@ -65,13 +80,14 @@ export function createAgentRunner(provider, options) {
|
|
|
65
80
|
sessions: new Map(),
|
|
66
81
|
settings: options?.settings ?? DEFAULT_SETTINGS,
|
|
67
82
|
disposals: createDisposalTracker(),
|
|
83
|
+
isClosed: false,
|
|
68
84
|
};
|
|
69
85
|
return {
|
|
70
86
|
start: (message, ctx) => startTurn(manager, message, ctx),
|
|
71
87
|
interruptSession: (conversationId) => interruptSession(manager, conversationId),
|
|
72
88
|
disposeSession: (conversationId) => disposeSession(manager, conversationId),
|
|
73
89
|
applySettings: (settings) => applySettings(manager, settings),
|
|
74
|
-
dispose: () => disposeAll(manager),
|
|
90
|
+
dispose: (reason) => disposeAll(manager, reason),
|
|
75
91
|
};
|
|
76
92
|
}
|
|
77
93
|
//# sourceMappingURL=runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAM5D,OAAO,EAAE,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAM5D,OAAO,EAAE,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA8DvD,SAAS,aAAa,CACpB,OAAuB,EACvB,GAAkB;IAElB,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;QACpC,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,eAAe,EAAE,EAAE;QAClC,oBAAoB,EAAE,GAAG,CAAC,oBAAoB;QAC9C,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;YACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC5C,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,KAAU,CAAC;AAEjC,KAAK,UAAU,WAAW,CACxB,OAAuB,EACvB,GAAkB;IAElB,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAuB,EACvB,GAAkB;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC1D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,OAAO,CAAC,QAAQ;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;IACpE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,SAAS,CACvB,OAAuB,EACvB,OAAe,EACf,GAAkB;IAElB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,kBAAkB,CACjC,OAAO,EACP,GAAG,CAAC,cAAc,EAAE,EACpB,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CACzD,CAAC;IACF,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,CACpB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,EAAE,EACtD,OAAO,CAAC,QAAQ,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAuB,EACvB,cAAsB;IAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACrD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAClC,OAAO,CAAC,SAAS,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,cAAc,CACrB,OAAuB,EACvB,cAAsB;IAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACrD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IACnC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,OAAuB,EACvB,MAAoB;IAEpB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IACxB,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACzB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;AACnC,CAAC;AAED,SAAS,aAAa,CAAC,OAAuB,EAAE,QAAqB;IACnE,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QAChD,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAuB,EACvB,OAA4B;IAE5B,MAAM,OAAO,GAAmB;QAC9B,QAAQ;QACR,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,gBAAgB;QAC/C,SAAS,EAAE,qBAAqB,EAAE;QAClC,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,OAAO;QACL,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC;QACzD,gBAAgB,EAAE,CAAC,cAAc,EAAE,EAAE,CACnC,gBAAgB,CAAC,OAAO,EAAE,cAAc,CAAC;QAC3C,cAAc,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC;QAC3E,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC7D,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;KACjD,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AppSettings } from "../state/settings-types.js";
|
|
2
2
|
import type { TurnInput } from "./provider.js";
|
|
3
|
-
import type { RunnerEvent } from "./runner-events.js";
|
|
3
|
+
import type { RunnerError, RunnerEvent } from "./runner-events.js";
|
|
4
4
|
export interface SessionControls {
|
|
5
5
|
submitTurn(input: TurnInput): void | Promise<void>;
|
|
6
6
|
interrupt(): void;
|
|
@@ -11,7 +11,7 @@ export interface AgentSession {
|
|
|
11
11
|
sendTurn(input: TurnInput, timeoutMs: number): AsyncIterable<RunnerEvent>;
|
|
12
12
|
applySettings(settings: AppSettings): void;
|
|
13
13
|
interrupt(): void;
|
|
14
|
-
dispose: () => Promise<void>;
|
|
14
|
+
dispose: (reason?: RunnerError) => Promise<void>;
|
|
15
15
|
}
|
|
16
16
|
export interface SessionDeps {
|
|
17
17
|
events: AsyncIterator<RunnerEvent, void>;
|