@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,31 +1,46 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execFileSync, spawn } from "node:child_process";
|
|
2
2
|
import { mkdirSync, readFileSync } from "node:fs";
|
|
3
|
-
import { readFile, rm, writeFile } from "node:fs/promises";
|
|
3
|
+
import { readdir, readFile, rm, writeFile } from "node:fs/promises";
|
|
4
4
|
import path from "node:path";
|
|
5
|
-
import {
|
|
6
|
-
import { CODEX_APP_SERVER_COMMAND, CODEX_AUTH_FILE_MODE, CODEX_AUTH_FILE_NAME, CODEX_BINARY_NAME, CODEX_CLIENT_ABORTED_MESSAGE, CODEX_CONFIG_FILE_NAME, CODEX_EXITED_MESSAGE, CODEX_HOME_DIR_NAME, CODEX_HOME_ENV_VAR, CODEX_HOME_REMOVAL_FAILED_MESSAGE, CODEX_KILL_GRACE_MS, CODEX_LOG_PREFIX, CODEX_MCP_TOKEN_ENV_VAR, CODEX_PID_REGISTRY_FILE, CODEX_PID_RELEASE_FAILED_MESSAGE, CODEX_PID_TOKEN, CODEX_PROC_CMDLINE, CODEX_SPAWN_FAILED_MESSAGE, CODEX_STDERR_TAIL_BYTES, CODEX_STRICT_CONFIG_FLAG, CODEX_SURVIVED_STOP_MESSAGE, CODEX_TERMINATE_GRACE_MS, PROCESS_QUERY_BY_PLATFORM, WINDOWS_PLATFORM, WINDOWS_TREE_KILL, } from "../../constants/codex.js";
|
|
5
|
+
import { CODEX_APP_SERVER_COMMAND, CODEX_AUTH_FILE_MODE, CODEX_AUTH_FILE_NAME, CODEX_BINARY_NAME, CODEX_CLIENT_ABORTED_MESSAGE, CODEX_CONFIG_FILE_NAME, CODEX_EXITED_MESSAGE, CODEX_HOME_DIR_NAME, CODEX_HOME_ENV_VAR, CODEX_HOME_REMOVAL_FAILED_MESSAGE, CODEX_LOG_PREFIX, CODEX_MCP_TOKEN_ENV_VAR, CODEX_ORPHAN_POLL_MS, CODEX_PID_REGISTRY_FILE, CODEX_PID_RELEASE_FAILED_MESSAGE, CODEX_PID_TOKEN, CODEX_PROC_CMDLINE, CODEX_SPAWN_FAILED_MESSAGE, CODEX_STDERR_TAIL_BYTES, CODEX_STRICT_CONFIG_FLAG, CODEX_SURVIVED_STOP_MESSAGE, PROCESS_QUERY_BY_PLATFORM, } from "../../constants/codex.js";
|
|
7
6
|
import { safeDirSegment } from "../../state/safe-segment.js";
|
|
8
7
|
import { createCodexClient } from "./client.js";
|
|
9
8
|
import { buildAuthFile, buildConfigToml } from "./config.js";
|
|
9
|
+
import { isWindowsHost, runStopSteps, sweepProcessTree, } from "./stop.js";
|
|
10
10
|
export function codexHomeFor(stateDir, conversationId) {
|
|
11
11
|
return path.join(stateDir, CODEX_HOME_DIR_NAME, safeDirSegment(conversationId));
|
|
12
12
|
}
|
|
13
13
|
function pidRegistryPath(stateDir) {
|
|
14
14
|
return path.join(stateDir, CODEX_PID_REGISTRY_FILE);
|
|
15
15
|
}
|
|
16
|
+
function toPidRecord(entry) {
|
|
17
|
+
if (Number.isInteger(entry))
|
|
18
|
+
return { pid: entry };
|
|
19
|
+
if (entry === null || typeof entry !== "object")
|
|
20
|
+
return undefined;
|
|
21
|
+
const { pid, home } = entry;
|
|
22
|
+
if (pid === undefined || !Number.isInteger(pid))
|
|
23
|
+
return undefined;
|
|
24
|
+
return typeof home === "string" ? { pid, home } : { pid };
|
|
25
|
+
}
|
|
26
|
+
function isPidRecord(record) {
|
|
27
|
+
return record !== undefined;
|
|
28
|
+
}
|
|
16
29
|
async function readPidRegistry(stateDir) {
|
|
17
30
|
try {
|
|
18
31
|
const raw = await readFile(pidRegistryPath(stateDir), "utf8");
|
|
19
32
|
const parsed = JSON.parse(raw);
|
|
20
|
-
|
|
33
|
+
if (!Array.isArray(parsed))
|
|
34
|
+
return [];
|
|
35
|
+
return parsed.map(toPidRecord).filter(isPidRecord);
|
|
21
36
|
}
|
|
22
37
|
catch {
|
|
23
38
|
return [];
|
|
24
39
|
}
|
|
25
40
|
}
|
|
26
|
-
async function writePidRegistry(stateDir,
|
|
41
|
+
async function writePidRegistry(stateDir, records) {
|
|
27
42
|
mkdirSync(stateDir, { recursive: true });
|
|
28
|
-
await writeFile(pidRegistryPath(stateDir), JSON.stringify([...
|
|
43
|
+
await writeFile(pidRegistryPath(stateDir), JSON.stringify([...records]));
|
|
29
44
|
}
|
|
30
45
|
function readProcCmdline(pid) {
|
|
31
46
|
return readFileSync(CODEX_PROC_CMDLINE.replace(CODEX_PID_TOKEN, String(pid)), "utf8");
|
|
@@ -52,48 +67,18 @@ export function readProcessCommand(pid) {
|
|
|
52
67
|
export function isCodexProcess(pid) {
|
|
53
68
|
return readProcessCommand(pid)?.includes(CODEX_BINARY_NAME) === true;
|
|
54
69
|
}
|
|
55
|
-
const execFileAsync = promisify(execFile);
|
|
56
|
-
async function terminateWindows(pid) {
|
|
57
|
-
const [command, ...args] = WINDOWS_TREE_KILL;
|
|
58
|
-
await execFileAsync(command, args.map((arg) => arg.replace(CODEX_PID_TOKEN, String(pid))), { windowsHide: true }).catch(() => undefined);
|
|
59
|
-
}
|
|
60
|
-
function sendSignal(pid, signal) {
|
|
61
|
-
try {
|
|
62
|
-
process.kill(pid, signal);
|
|
63
|
-
}
|
|
64
|
-
catch {
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
const POSIX_STOP_STEPS = [
|
|
68
|
-
{
|
|
69
|
-
send: (pid) => sendSignal(pid, "SIGTERM"),
|
|
70
|
-
waitMs: CODEX_TERMINATE_GRACE_MS,
|
|
71
|
-
},
|
|
72
|
-
{ send: (pid) => sendSignal(pid, "SIGKILL"), waitMs: CODEX_KILL_GRACE_MS },
|
|
73
|
-
];
|
|
74
|
-
const WINDOWS_STOP_STEPS = [
|
|
75
|
-
{ send: terminateWindows, waitMs: CODEX_KILL_GRACE_MS },
|
|
76
|
-
];
|
|
77
|
-
function platformStopSteps() {
|
|
78
|
-
return process.platform === WINDOWS_PLATFORM
|
|
79
|
-
? WINDOWS_STOP_STEPS
|
|
80
|
-
: POSIX_STOP_STEPS;
|
|
81
|
-
}
|
|
82
|
-
async function runStopSteps(pid, stoppedWithin) {
|
|
83
|
-
for (const step of platformStopSteps()) {
|
|
84
|
-
await step.send(pid);
|
|
85
|
-
if (await stoppedWithin(step.waitMs))
|
|
86
|
-
return true;
|
|
87
|
-
}
|
|
88
|
-
return false;
|
|
89
|
-
}
|
|
90
70
|
function waitUnref(waitMs) {
|
|
91
71
|
return new Promise((resolve) => setTimeout(resolve, waitMs).unref());
|
|
92
72
|
}
|
|
93
73
|
function orphanGoneWithin(pid) {
|
|
94
74
|
return async (waitMs) => {
|
|
95
|
-
|
|
96
|
-
|
|
75
|
+
const deadline = Date.now() + waitMs;
|
|
76
|
+
while (isCodexProcess(pid)) {
|
|
77
|
+
if (Date.now() >= deadline)
|
|
78
|
+
return false;
|
|
79
|
+
await waitUnref(CODEX_ORPHAN_POLL_MS);
|
|
80
|
+
}
|
|
81
|
+
return true;
|
|
97
82
|
};
|
|
98
83
|
}
|
|
99
84
|
function hasExited(child) {
|
|
@@ -119,14 +104,40 @@ async function stopChild(child, pid) {
|
|
|
119
104
|
return true;
|
|
120
105
|
return runStopSteps(pid, (waitMs) => exitsWithin(child, waitMs));
|
|
121
106
|
}
|
|
107
|
+
async function stopOrphan(record) {
|
|
108
|
+
const isStopped = await runStopSteps(record.pid, orphanGoneWithin(record.pid));
|
|
109
|
+
return { record, isStopped };
|
|
110
|
+
}
|
|
111
|
+
async function removeOrphanHomes(stateDir, survivors) {
|
|
112
|
+
if (survivors.some((record) => record.home === undefined))
|
|
113
|
+
return;
|
|
114
|
+
const kept = new Set(survivors.map((record) => record.home));
|
|
115
|
+
const homesRoot = path.join(stateDir, CODEX_HOME_DIR_NAME);
|
|
116
|
+
const entries = await readdir(homesRoot).catch(() => []);
|
|
117
|
+
const orphanHomes = entries
|
|
118
|
+
.map((entry) => path.join(homesRoot, entry))
|
|
119
|
+
.filter((home) => !kept.has(home));
|
|
120
|
+
await Promise.all(orphanHomes.map(removeHome));
|
|
121
|
+
}
|
|
122
|
+
async function forgetReaped(stateDir, recorded, survivors) {
|
|
123
|
+
if (recorded.length === 0)
|
|
124
|
+
return;
|
|
125
|
+
const survivorPids = new Set(survivors.map((record) => record.pid));
|
|
126
|
+
const settled = new Set(recorded
|
|
127
|
+
.map((record) => record.pid)
|
|
128
|
+
.filter((pid) => !survivorPids.has(pid)));
|
|
129
|
+
await updateRegistry(stateDir, (current) => current.filter((record) => !settled.has(record.pid)));
|
|
130
|
+
}
|
|
122
131
|
export async function reapOrphanCodexProcesses(stateDir) {
|
|
123
132
|
const recorded = await readPidRegistry(stateDir);
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
await
|
|
133
|
+
const orphans = recorded.filter((record) => isCodexProcess(record.pid));
|
|
134
|
+
const outcomes = await Promise.all(orphans.map(stopOrphan));
|
|
135
|
+
const survivors = outcomes
|
|
136
|
+
.filter((outcome) => !outcome.isStopped)
|
|
137
|
+
.map((outcome) => outcome.record);
|
|
138
|
+
await forgetReaped(stateDir, recorded, survivors);
|
|
139
|
+
await removeOrphanHomes(stateDir, survivors);
|
|
140
|
+
const killed = orphans.map((record) => record.pid);
|
|
130
141
|
if (killed.length > 0) {
|
|
131
142
|
console.warn(`${CODEX_LOG_PREFIX} reaped orphan processes: ${killed.join(", ")}`);
|
|
132
143
|
}
|
|
@@ -141,13 +152,14 @@ function updateRegistry(stateDir, mutate) {
|
|
|
141
152
|
registryQueue = next.catch(() => undefined);
|
|
142
153
|
return next;
|
|
143
154
|
}
|
|
144
|
-
function recordPid(stateDir, pid) {
|
|
155
|
+
function recordPid(stateDir, pid, home) {
|
|
145
156
|
return updateRegistry(stateDir, (recorded) => [
|
|
146
|
-
...
|
|
157
|
+
...recorded.filter((record) => record.pid !== pid),
|
|
158
|
+
{ pid, home },
|
|
147
159
|
]);
|
|
148
160
|
}
|
|
149
161
|
function forgetPid(stateDir, pid) {
|
|
150
|
-
return updateRegistry(stateDir, (recorded) => recorded.filter((
|
|
162
|
+
return updateRegistry(stateDir, (recorded) => recorded.filter((record) => record.pid !== pid));
|
|
151
163
|
}
|
|
152
164
|
const releasingHomes = new Map();
|
|
153
165
|
function trackRelease(codexHome, release) {
|
|
@@ -177,6 +189,7 @@ function spawnChild(options, codexHome) {
|
|
|
177
189
|
CODEX_STRICT_CONFIG_FLAG,
|
|
178
190
|
], {
|
|
179
191
|
stdio: ["pipe", "pipe", "pipe"],
|
|
192
|
+
detached: !isWindowsHost(),
|
|
180
193
|
env: {
|
|
181
194
|
...process.env,
|
|
182
195
|
[CODEX_HOME_ENV_VAR]: codexHome,
|
|
@@ -253,36 +266,56 @@ async function disposeProcess(teardown) {
|
|
|
253
266
|
await removeHome(teardown.codexHome);
|
|
254
267
|
}
|
|
255
268
|
}
|
|
269
|
+
function sweepOnExit(child) {
|
|
270
|
+
const { pid } = child;
|
|
271
|
+
if (pid === undefined)
|
|
272
|
+
return;
|
|
273
|
+
child.once("exit", () => sweepProcessTree(pid));
|
|
274
|
+
}
|
|
275
|
+
function buildCodexProcess(teardown) {
|
|
276
|
+
let disposal = null;
|
|
277
|
+
return {
|
|
278
|
+
client: teardown.client,
|
|
279
|
+
codexHome: teardown.codexHome,
|
|
280
|
+
pid: teardown.child.pid,
|
|
281
|
+
dispose: () => {
|
|
282
|
+
if (disposal !== null)
|
|
283
|
+
return disposal;
|
|
284
|
+
disposal = disposeProcess(teardown);
|
|
285
|
+
trackRelease(teardown.codexHome, disposal);
|
|
286
|
+
return disposal;
|
|
287
|
+
},
|
|
288
|
+
};
|
|
289
|
+
}
|
|
290
|
+
async function registerPid(stateDir, spawned) {
|
|
291
|
+
if (spawned.pid === undefined)
|
|
292
|
+
return;
|
|
293
|
+
try {
|
|
294
|
+
await recordPid(stateDir, spawned.pid, spawned.codexHome);
|
|
295
|
+
}
|
|
296
|
+
catch (error) {
|
|
297
|
+
await spawned.dispose();
|
|
298
|
+
throw error;
|
|
299
|
+
}
|
|
300
|
+
}
|
|
256
301
|
export async function spawnCodexProcess(options) {
|
|
257
302
|
const codexHome = await prepareCodexHome(options);
|
|
258
303
|
const child = spawnChild(options, codexHome);
|
|
259
304
|
const watchdog = watchChild(child, drainStderr(child));
|
|
305
|
+
sweepOnExit(child);
|
|
260
306
|
if (child.stdin === null || child.stdout === null) {
|
|
261
307
|
throw new Error(`${CODEX_LOG_PREFIX} failed to open app-server pipes`);
|
|
262
308
|
}
|
|
263
309
|
const client = createCodexClient(child.stdin, child.stdout, options.handlers);
|
|
264
310
|
watchdog.arm(client);
|
|
265
|
-
const
|
|
266
|
-
|
|
267
|
-
await recordPid(options.stateDir, pid);
|
|
268
|
-
let disposal = null;
|
|
269
|
-
return {
|
|
270
|
-
client,
|
|
311
|
+
const spawned = buildCodexProcess({
|
|
312
|
+
stateDir: options.stateDir,
|
|
271
313
|
codexHome,
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
codexHome,
|
|
279
|
-
client,
|
|
280
|
-
watchdog,
|
|
281
|
-
child,
|
|
282
|
-
});
|
|
283
|
-
trackRelease(codexHome, disposal);
|
|
284
|
-
return disposal;
|
|
285
|
-
},
|
|
286
|
-
};
|
|
314
|
+
client,
|
|
315
|
+
watchdog,
|
|
316
|
+
child,
|
|
317
|
+
});
|
|
318
|
+
await registerPid(options.stateDir, spawned);
|
|
319
|
+
return spawned;
|
|
287
320
|
}
|
|
288
321
|
//# sourceMappingURL=process.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../src/providers/codex/process.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../src/providers/codex/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import os from "node:os";
|
|
2
2
|
import { createAgentSession } from "../../agent/session.js";
|
|
3
3
|
import { TURN_IDLE_TIMEOUT_MS } from "../../constants/agent.js";
|
|
4
|
-
import { CODEX_CLIENT_NAME, CODEX_CLIENT_TITLE, CODEX_CLIENT_VERSION, CODEX_HANDSHAKE_TIMEOUT_MS, CODEX_INITIALIZE_METHOD, CODEX_INITIALIZED_METHOD, CODEX_MAX_LIVE_SESSIONS, CODEX_MISSING_API_KEY_MESSAGE, CODEX_MISSING_CLI_MESSAGE, CODEX_SKILLS_CONFIG_WRITE_METHOD, CODEX_SKILLS_EXTRA_ROOTS_METHOD, CODEX_SKILLS_LIST_METHOD, CODEX_THREAD_START_METHOD, CODEX_TOKEN_USAGE_NOTIFICATION, CODEX_TURN_ABORTED_MESSAGE, CODEX_TURN_INTERRUPT_METHOD, CODEX_TURN_START_METHOD, CODEX_TURN_STARTED_NOTIFICATION, CODEX_VERSION_MISMATCH_MESSAGE, } from "../../constants/codex.js";
|
|
4
|
+
import { CODEX_CLIENT_NAME, CODEX_CLIENT_TITLE, CODEX_CLIENT_VERSION, CODEX_HANDSHAKE_TIMEOUT_MS, CODEX_INITIALIZE_METHOD, CODEX_INITIALIZED_METHOD, CODEX_LOG_PREFIX, CODEX_MAX_LIVE_SESSIONS, CODEX_MISSING_API_KEY_MESSAGE, CODEX_MISSING_CLI_MESSAGE, CODEX_SKILLS_CONFIG_WRITE_METHOD, CODEX_SKILLS_EXTRA_ROOTS_METHOD, CODEX_SKILLS_LIST_METHOD, CODEX_THREAD_START_METHOD, CODEX_TOKEN_USAGE_NOTIFICATION, CODEX_TURN_ABORTED_MESSAGE, CODEX_TURN_INTERRUPT_METHOD, CODEX_TURN_START_METHOD, CODEX_TURN_STARTED_NOTIFICATION, CODEX_VERSION_MISMATCH_MESSAGE, SAFE_MODE_SKILL_MISSING_MESSAGE, SAFE_MODE_SKILL_MISSING_WARNING, } from "../../constants/codex.js";
|
|
5
5
|
import { resolveSkillSources } from "../../skills/resolve-sources.js";
|
|
6
6
|
import { createCodexAdapter } from "./adapter.js";
|
|
7
7
|
import { buildCodexTurnInput } from "./attachments.js";
|
|
8
|
-
import { buildDenialReminder, buildDeveloperInstructions, buildTurnOverrides, resolveModePolicy, } from "./config.js";
|
|
8
|
+
import { buildDenialReminder, buildDeveloperInstructions, buildTurnOverrides, isSafeMode, resolveModePolicy, } from "./config.js";
|
|
9
9
|
import { createRunnerEventStream } from "./event-stream.js";
|
|
10
10
|
import { createCodexPermissionHandler } from "./permissions.js";
|
|
11
11
|
import { spawnCodexProcess } from "./process.js";
|
|
12
12
|
import { describeVersionMismatch, isCodexInstallationUsable, resolveCodexInstallation, } from "./resolve-binary.js";
|
|
13
|
-
import { buildSkillExtraRoots, selectSkillsToDisable } from "./skills.js";
|
|
13
|
+
import { buildSkillExtraRoots, isSafeModeSkillIndexed, selectSkillsToDisable, } from "./skills.js";
|
|
14
14
|
const HANDSHAKE = {
|
|
15
15
|
timeoutMs: CODEX_HANDSHAKE_TIMEOUT_MS,
|
|
16
16
|
};
|
|
@@ -24,6 +24,16 @@ function clientInfo() {
|
|
|
24
24
|
capabilities: null,
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
|
+
async function disableForeignSkills(process, listed, input) {
|
|
28
|
+
for (const params of selectSkillsToDisable(listed, input)) {
|
|
29
|
+
await process.client.request(CODEX_SKILLS_CONFIG_WRITE_METHOD, params, HANDSHAKE);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function warnIfSafeModeSkillMissing(isIndexed) {
|
|
33
|
+
if (isIndexed)
|
|
34
|
+
return;
|
|
35
|
+
console.warn(`${CODEX_LOG_PREFIX} ${SAFE_MODE_SKILL_MISSING_WARNING}`);
|
|
36
|
+
}
|
|
27
37
|
async function configureSkills(process, options, settings) {
|
|
28
38
|
const sources = resolveSkillSources(options.skillDirs ?? [], settings.allowLocalSkills, os.homedir());
|
|
29
39
|
const extraRoots = buildSkillExtraRoots(sources);
|
|
@@ -31,13 +41,13 @@ async function configureSkills(process, options, settings) {
|
|
|
31
41
|
await process.client.request(CODEX_SKILLS_EXTRA_ROOTS_METHOD, { extraRoots }, HANDSHAKE);
|
|
32
42
|
}
|
|
33
43
|
const listed = await process.client.request(CODEX_SKILLS_LIST_METHOD, {}, HANDSHAKE);
|
|
34
|
-
|
|
44
|
+
await disableForeignSkills(process, listed.data, {
|
|
35
45
|
extraRoots,
|
|
36
46
|
allowLocalSkills: settings.allowLocalSkills,
|
|
37
47
|
});
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
48
|
+
const isIndexed = isSafeModeSkillIndexed(listed.data);
|
|
49
|
+
warnIfSafeModeSkillMissing(isIndexed);
|
|
50
|
+
return isIndexed;
|
|
41
51
|
}
|
|
42
52
|
async function startThread(process, ctx) {
|
|
43
53
|
const policy = resolveModePolicy(ctx.settings);
|
|
@@ -54,7 +64,15 @@ function withDenialReminder(backend, text) {
|
|
|
54
64
|
const reminder = buildDenialReminder(backend.live.settings, backend.denials());
|
|
55
65
|
return reminder === undefined ? text : `${text}\n\n${reminder}`;
|
|
56
66
|
}
|
|
67
|
+
function assertSafeModeSkillAvailable(backend) {
|
|
68
|
+
if (backend.isSafeModeSkillIndexed)
|
|
69
|
+
return;
|
|
70
|
+
if (!isSafeMode(backend.live.settings))
|
|
71
|
+
return;
|
|
72
|
+
throw new Error(SAFE_MODE_SKILL_MISSING_MESSAGE);
|
|
73
|
+
}
|
|
57
74
|
async function submitTurn(backend, options, input) {
|
|
75
|
+
assertSafeModeSkillAvailable(backend);
|
|
58
76
|
backend.resumeApprovals();
|
|
59
77
|
const overrides = buildTurnOverrides(backend.live.settings, {
|
|
60
78
|
hostProjectRoot: backend.hostProjectRoot,
|
|
@@ -115,11 +133,43 @@ function assertUsableInstallation() {
|
|
|
115
133
|
}
|
|
116
134
|
return installation;
|
|
117
135
|
}
|
|
118
|
-
async function
|
|
136
|
+
async function handshake(codexProcess, options, ctx) {
|
|
137
|
+
await codexProcess.client.request(CODEX_INITIALIZE_METHOD, clientInfo(), HANDSHAKE);
|
|
138
|
+
codexProcess.client.notify(CODEX_INITIALIZED_METHOD, {});
|
|
139
|
+
const isSafeModeSkillIndexed = await configureSkills(codexProcess, options, ctx.settings);
|
|
140
|
+
const threadId = await startThread(codexProcess, ctx);
|
|
141
|
+
return { threadId, isSafeModeSkillIndexed };
|
|
142
|
+
}
|
|
143
|
+
async function openCodexProcess(options, ctx, handlers) {
|
|
119
144
|
const installation = assertUsableInstallation();
|
|
120
145
|
const apiKey = options.getApiKey();
|
|
121
146
|
if (apiKey === undefined)
|
|
122
147
|
throw new Error(CODEX_MISSING_API_KEY_MESSAGE);
|
|
148
|
+
const mcpToken = await options.mcpHttpRegistry.register(options.createMcpDeps(ctx.conversationId));
|
|
149
|
+
let codexProcess;
|
|
150
|
+
try {
|
|
151
|
+
codexProcess = await spawnCodexProcess({
|
|
152
|
+
conversationId: ctx.conversationId,
|
|
153
|
+
stateDir: options.stateDir,
|
|
154
|
+
installation,
|
|
155
|
+
mcpUrl: options.getMcpUrl(),
|
|
156
|
+
mcpToken,
|
|
157
|
+
hostProjectRoot: ctx.hostProjectRoot,
|
|
158
|
+
apiKey,
|
|
159
|
+
handlers,
|
|
160
|
+
});
|
|
161
|
+
const outcome = await handshake(codexProcess, options, ctx);
|
|
162
|
+
return { codexProcess, ...outcome };
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
await codexProcess?.dispose();
|
|
166
|
+
await options.mcpHttpRegistry
|
|
167
|
+
.release(ctx.conversationId)
|
|
168
|
+
.catch(() => undefined);
|
|
169
|
+
throw error;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
async function createProviderSession(options, ctx, live) {
|
|
123
173
|
const stream = createRunnerEventStream();
|
|
124
174
|
const adapter = createCodexAdapter();
|
|
125
175
|
const backendRef = { current: null };
|
|
@@ -130,30 +180,16 @@ async function createProviderSession(options, ctx, live) {
|
|
|
130
180
|
getChangedPaths: (itemId) => adapter.getChangedPaths(itemId),
|
|
131
181
|
onPermissionDecision: ctx.onPermissionDecision,
|
|
132
182
|
});
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
mcpToken,
|
|
140
|
-
hostProjectRoot: ctx.hostProjectRoot,
|
|
141
|
-
apiKey,
|
|
142
|
-
handlers: {
|
|
143
|
-
onNotification: (notification) => {
|
|
144
|
-
trackTurnId(backendRef, notification);
|
|
145
|
-
reportTokenUsage(ctx, notification);
|
|
146
|
-
for (const event of adapter.handle(notification))
|
|
147
|
-
stream.push(event);
|
|
148
|
-
},
|
|
149
|
-
onServerRequest: (request) => permissions.handle(request),
|
|
150
|
-
onAbort: (reason) => stream.fail(reason),
|
|
183
|
+
const { codexProcess, threadId, isSafeModeSkillIndexed } = await openCodexProcess(options, ctx, {
|
|
184
|
+
onNotification: (notification) => {
|
|
185
|
+
trackTurnId(backendRef, notification);
|
|
186
|
+
reportTokenUsage(ctx, notification);
|
|
187
|
+
for (const event of adapter.handle(notification))
|
|
188
|
+
stream.push(event);
|
|
151
189
|
},
|
|
190
|
+
onServerRequest: (request) => permissions.handle(request),
|
|
191
|
+
onAbort: (reason) => stream.fail(reason),
|
|
152
192
|
});
|
|
153
|
-
await codexProcess.client.request(CODEX_INITIALIZE_METHOD, clientInfo(), HANDSHAKE);
|
|
154
|
-
codexProcess.client.notify(CODEX_INITIALIZED_METHOD, {});
|
|
155
|
-
await configureSkills(codexProcess, options, ctx.settings);
|
|
156
|
-
const threadId = await startThread(codexProcess, ctx);
|
|
157
193
|
const backend = {
|
|
158
194
|
process: codexProcess,
|
|
159
195
|
threadId,
|
|
@@ -161,6 +197,7 @@ async function createProviderSession(options, ctx, live) {
|
|
|
161
197
|
live: { settings: ctx.settings },
|
|
162
198
|
conversationId: ctx.conversationId,
|
|
163
199
|
hostProjectRoot: ctx.hostProjectRoot,
|
|
200
|
+
isSafeModeSkillIndexed,
|
|
164
201
|
denials: () => permissions.consecutiveDenials(),
|
|
165
202
|
resumeApprovals: () => permissions.resume(),
|
|
166
203
|
};
|
|
@@ -195,7 +232,7 @@ async function createProviderSession(options, ctx, live) {
|
|
|
195
232
|
return session.sendTurn(input, resolveTimeoutMs(options));
|
|
196
233
|
},
|
|
197
234
|
interrupt: () => session.interrupt(),
|
|
198
|
-
dispose: () => session.dispose(),
|
|
235
|
+
dispose: (reason) => session.dispose(reason),
|
|
199
236
|
applySettings: (settings) => {
|
|
200
237
|
backend.live.settings = settings;
|
|
201
238
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/providers/codex/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAQzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACvB,6BAA6B,EAC7B,yBAAyB,EACzB,gCAAgC,EAChC,+BAA+B,EAC/B,wBAAwB,EACxB,yBAAyB,EACzB,8BAA8B,EAC9B,0BAA0B,EAC1B,2BAA2B,EAC3B,uBAAuB,EACvB,+BAA+B,EAC/B,8BAA8B,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/providers/codex/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,3 +8,4 @@ export declare function buildSkillExtraRoots(sources: readonly SkillSource[]): s
|
|
|
8
8
|
export declare function collectListedSkills(entries: readonly v2.SkillsListEntry[]): v2.SkillMetadata[];
|
|
9
9
|
export declare function selectSkillsToDisable(entries: readonly v2.SkillsListEntry[], input: SkillNeutralizationInput): v2.SkillsConfigWriteParams[];
|
|
10
10
|
export declare function findMissingSkills(entries: readonly v2.SkillsListEntry[], requiredNames: readonly string[]): string[];
|
|
11
|
+
export declare function isSafeModeSkillIndexed(entries: readonly v2.SkillsListEntry[]): boolean;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
-
import { CODEX_OWNED_SKILL_SCOPES } from "../../constants/codex.js";
|
|
2
|
+
import { CODEX_OWNED_SKILL_SCOPES, SAFE_MODE_SKILL_NAME, } from "../../constants/codex.js";
|
|
3
3
|
export function buildSkillExtraRoots(sources) {
|
|
4
4
|
const seen = new Set();
|
|
5
5
|
for (const source of sources)
|
|
@@ -39,4 +39,7 @@ export function findMissingSkills(entries, requiredNames) {
|
|
|
39
39
|
.map((skill) => skill.name));
|
|
40
40
|
return requiredNames.filter((name) => !present.has(name));
|
|
41
41
|
}
|
|
42
|
+
export function isSafeModeSkillIndexed(entries) {
|
|
43
|
+
return findMissingSkills(entries, [SAFE_MODE_SKILL_NAME]).length === 0;
|
|
44
|
+
}
|
|
42
45
|
//# sourceMappingURL=skills.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../src/providers/codex/skills.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../src/providers/codex/skills.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAalC,MAAM,UAAU,oBAAoB,CAClC,OAA+B;IAE/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAsC;IAEtC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,WAAW,CAAC,MAAc,EAAE,IAAY;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,iBAAiB,CACxB,KAAuB,EACvB,UAA6B;IAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,WAAW,CAClB,KAAuB,EACvB,KAA+B;IAE/B,IAAI,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IACjC,IAAI,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7D,IAAI,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;AACjC,CAAC;AAQD,MAAM,UAAU,qBAAqB,CACnC,OAAsC,EACtC,KAA+B;IAE/B,OAAO,mBAAmB,CAAC,OAAO,CAAC;SAChC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SAC5C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAC5D,CAAC;AAGD,MAAM,UAAU,iBAAiB,CAC/B,OAAsC,EACtC,aAAgC;IAEhC,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,mBAAmB,CAAC,OAAO,CAAC;SACzB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;SAChC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAC9B,CAAC;IACF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5D,CAAC;AAGD,MAAM,UAAU,sBAAsB,CACpC,OAAsC;IAEtC,OAAO,iBAAiB,CAAC,OAAO,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export type StoppedWithin = (waitMs: number) => Promise<boolean>;
|
|
2
|
+
export declare function isWindowsHost(): boolean;
|
|
3
|
+
export declare function sweepProcessTree(pid: number): void;
|
|
4
|
+
export declare function runStopSteps(pid: number, stoppedWithin: StoppedWithin): Promise<boolean>;
|