@dirgha/code 1.22.0 → 1.24.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/CHANGELOG.md +171 -0
- package/README.md +8 -4
- package/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.d.ts +36 -5
- package/dist/cli/config.js +31 -3
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +40 -24
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +13 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +61 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -23
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -0
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +28 -3
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/index.d.ts +2 -1
- package/dist/cli/slash/index.js +3 -1
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/models.js +339 -7
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +4 -7
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.d.ts +1 -0
- package/dist/cli/slash/provider.js +33 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/sandbox.d.ts +21 -0
- package/dist/cli/slash/sandbox.js +84 -0
- package/dist/cli/slash/sandbox.js.map +1 -0
- package/dist/cli/slash.d.ts +5 -0
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +28 -8
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +4 -0
- package/dist/cli/subcommands/doctor.js +117 -21
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.js +6 -6
- package/dist/cli/subcommands/feature-setup.js.map +1 -1
- package/dist/cli/subcommands/memory.js +23 -0
- package/dist/cli/subcommands/memory.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/_fts.js +4 -1
- package/dist/context/_fts.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +44 -21
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +1 -0
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +8 -1
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -1
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.d.ts +17 -0
- package/dist/context/primer.js +50 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +4 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/embeddings/iface.d.ts +26 -0
- package/dist/embeddings/iface.js +15 -0
- package/dist/embeddings/iface.js.map +1 -0
- package/dist/embeddings/local.d.ts +24 -0
- package/dist/embeddings/local.js +112 -0
- package/dist/embeddings/local.js.map +1 -0
- package/dist/embeddings/remote.d.ts +31 -0
- package/dist/embeddings/remote.js +88 -0
- package/dist/embeddings/remote.js.map +1 -0
- package/dist/embeddings/select.d.ts +24 -0
- package/dist/embeddings/select.js +39 -0
- package/dist/embeddings/select.js.map +1 -0
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/failover-chain.js +10 -1
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +45 -11
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/abort-utils.d.ts +4 -0
- package/dist/kernel/abort-utils.js +45 -0
- package/dist/kernel/abort-utils.js.map +1 -0
- package/dist/kernel/agent-loop.js +104 -25
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/tool-timeout.d.ts +27 -0
- package/dist/kernel/tool-timeout.js +53 -0
- package/dist/kernel/tool-timeout.js.map +1 -0
- package/dist/kernel/types.d.ts +3 -0
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/custom-provider.d.ts +31 -0
- package/dist/providers/custom-provider.js +72 -0
- package/dist/providers/custom-provider.js.map +1 -0
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +25 -2
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/family-fallback.js +5 -0
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini.js +33 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/index.d.ts +16 -0
- package/dist/providers/index.js +43 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/machine1.d.ts +30 -0
- package/dist/providers/machine1.js +341 -0
- package/dist/providers/machine1.js.map +1 -0
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +32 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +5 -2
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.js +11 -1
- package/dist/state/db-telemetry.js.map +1 -1
- package/dist/state/db.d.ts +7 -0
- package/dist/state/db.js +147 -3
- package/dist/state/db.js.map +1 -1
- package/dist/state/index.js +8 -4
- package/dist/state/index.js.map +1 -1
- package/dist/state/sync-index.d.ts +74 -0
- package/dist/state/sync-index.js +246 -0
- package/dist/state/sync-index.js.map +1 -0
- package/dist/state/transaction.d.ts +62 -0
- package/dist/state/transaction.js +65 -0
- package/dist/state/transaction.js.map +1 -0
- package/dist/state/vec.d.ts +28 -0
- package/dist/state/vec.js +113 -0
- package/dist/state/vec.js.map +1 -0
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +94 -63
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/db-workspace-info.d.ts +10 -0
- package/dist/tools/db-workspace-info.js +76 -0
- package/dist/tools/db-workspace-info.js.map +1 -0
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +6 -1
- package/dist/tools/exec.js +46 -4
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +13 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/github.d.ts +13 -0
- package/dist/tools/github.js +257 -0
- package/dist/tools/github.js.map +1 -0
- package/dist/tools/graph-neighbors.d.ts +9 -0
- package/dist/tools/graph-neighbors.js +77 -0
- package/dist/tools/graph-neighbors.js.map +1 -0
- package/dist/tools/graph-traverse.d.ts +10 -0
- package/dist/tools/graph-traverse.js +90 -0
- package/dist/tools/graph-traverse.js.map +1 -0
- package/dist/tools/index.d.ts +10 -2
- package/dist/tools/index.js +17 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/kb-search.d.ts +13 -0
- package/dist/tools/kb-search.js +113 -0
- package/dist/tools/kb-search.js.map +1 -0
- package/dist/tools/multimodal.js +30 -15
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/permission.js +5 -4
- package/dist/tools/permission.js.map +1 -1
- package/dist/tools/registry.d.ts +10 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.js +28 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +46 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +7 -1
- package/dist/tools/shell.js +178 -61
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/transactional-write.d.ts +10 -0
- package/dist/tools/transactional-write.js +132 -0
- package/dist/tools/transactional-write.js.map +1 -0
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.d.ts +2 -1
- package/dist/tui/ink/App.js +333 -79
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +20 -3
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +38 -21
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +20 -0
- package/dist/tui/ink/components/Logo.js +67 -1
- package/dist/tui/ink/components/Logo.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js.map +1 -1
- package/dist/tui/ink/components/SandboxPicker.d.ts +18 -0
- package/dist/tui/ink/components/SandboxPicker.js +77 -0
- package/dist/tui/ink/components/SandboxPicker.js.map +1 -0
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -11
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +21 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +5 -3
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/index.js +36 -14
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.d.ts +2 -0
- package/dist/tui/ink/ink-approval-bus.js +10 -0
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/markdown/display.js +9 -2
- package/dist/tui/ink/markdown/display.js.map +1 -1
- package/dist/tui/ink/markdown/split-point.js +8 -13
- package/dist/tui/ink/markdown/split-point.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/theme-context.js +6 -3
- package/dist/tui/ink/theme-context.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +6 -2
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-elapsed.d.ts +9 -1
- package/dist/tui/ink/use-elapsed.js +17 -2
- package/dist/tui/ink/use-elapsed.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +10 -0
- package/dist/tui/ink/use-event-projection.js +111 -12
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.js +9 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -1
- package/dist/tui/ink/use-overlays.d.ts +2 -2
- package/dist/tui/ink/use-overlays.js +20 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +18 -5
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +39 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +14 -6
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +12 -8
|
@@ -24,8 +24,17 @@ export async function* streamChatCompletions(opts) {
|
|
|
24
24
|
body.max_tokens = opts.maxTokens;
|
|
25
25
|
if (opts.tools && opts.tools.length > 0) {
|
|
26
26
|
body.tools = toOpenAITools(opts.tools, opts.sanitizeToolDescriptions);
|
|
27
|
-
if (opts.toolChoice
|
|
28
|
-
|
|
27
|
+
if (opts.toolChoice) {
|
|
28
|
+
if (opts.toolChoice === "auto") {
|
|
29
|
+
// skip setting tool_choice (default behavior)
|
|
30
|
+
}
|
|
31
|
+
else if (opts.toolChoice === "required") {
|
|
32
|
+
body.tool_choice = "any"; // OpenAI extension: 'any' means force a tool call
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
body.tool_choice = opts.toolChoice; // 'none'
|
|
36
|
+
}
|
|
37
|
+
}
|
|
29
38
|
}
|
|
30
39
|
if (opts.extraBody)
|
|
31
40
|
Object.assign(body, opts.extraBody);
|
|
@@ -39,6 +48,7 @@ export async function* streamChatCompletions(opts) {
|
|
|
39
48
|
extraHeaders: opts.extraHeaders,
|
|
40
49
|
signal: opts.signal,
|
|
41
50
|
timeoutMs: opts.timeoutMs,
|
|
51
|
+
stallTimeoutMs: opts.stallTimeoutMs,
|
|
42
52
|
})) {
|
|
43
53
|
if (payload === "[DONE]")
|
|
44
54
|
break;
|
|
@@ -109,11 +119,9 @@ function toOpenAIMessages(messages) {
|
|
|
109
119
|
const texts = parts
|
|
110
120
|
.filter((p) => p.type === "text")
|
|
111
121
|
.map((p) => p.text);
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
content: texts.join(""),
|
|
116
|
-
});
|
|
122
|
+
// Tool messages must immediately follow the assistant message that issued
|
|
123
|
+
// the tool calls. Push role:"tool" messages BEFORE any user text so
|
|
124
|
+
// OpenAI doesn't return HTTP 400 ("tool messages must follow assistant").
|
|
117
125
|
for (const r of results) {
|
|
118
126
|
if (r.type !== "tool_result")
|
|
119
127
|
continue;
|
|
@@ -123,6 +131,11 @@ function toOpenAIMessages(messages) {
|
|
|
123
131
|
content: r.content,
|
|
124
132
|
});
|
|
125
133
|
}
|
|
134
|
+
if (texts.length > 0)
|
|
135
|
+
out.push({
|
|
136
|
+
role: msg.role === "system" ? "system" : "user",
|
|
137
|
+
content: texts.join(""),
|
|
138
|
+
});
|
|
126
139
|
}
|
|
127
140
|
return out;
|
|
128
141
|
}
|
|
@@ -148,8 +161,11 @@ class StreamState {
|
|
|
148
161
|
inThinkBlock = false;
|
|
149
162
|
static THINK_OPEN_RE = /<(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
150
163
|
static THINK_CLOSE_RE = /<\/(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
151
|
-
// includeThinking is accepted but
|
|
152
|
-
// content is always
|
|
164
|
+
// includeThinking is accepted but not used to gate event emission —
|
|
165
|
+
// reasoning content is always yielded so assembleTurn can echo it back
|
|
166
|
+
// on multi-turn DeepSeek API calls (omitting it causes HTTP 400
|
|
167
|
+
// ("reasoning_content must be passed back to the API"). The display
|
|
168
|
+
// preference is handled by the TUI layer (showThinking flag).
|
|
153
169
|
constructor(_includeThinking) { }
|
|
154
170
|
/** Split a content delta into text + thinking pieces, honoring open <think> blocks across chunks. */
|
|
155
171
|
routeContent(input) {
|
|
@@ -205,6 +221,13 @@ class StreamState {
|
|
|
205
221
|
(typeof d.reasoning === "string" && d.reasoning) ||
|
|
206
222
|
"";
|
|
207
223
|
if (r.length > 0) {
|
|
224
|
+
// Close any open text stream before starting thinking — otherwise
|
|
225
|
+
// consumers see thinking_start while textOpen is still true, producing
|
|
226
|
+
// an overlapping/invalid event sequence.
|
|
227
|
+
if (this.textOpen) {
|
|
228
|
+
yield { type: "text_end" };
|
|
229
|
+
this.textOpen = false;
|
|
230
|
+
}
|
|
208
231
|
if (!this.thinkingOpen) {
|
|
209
232
|
yield { type: "thinking_start" };
|
|
210
233
|
this.thinkingOpen = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { streamChatCompletions } from "./openai-compat.js";
|
|
|
10
10
|
const DEFAULT_BASE = "https://openrouter.ai/api/v1";
|
|
11
11
|
const TOOL_SUPPORT = [
|
|
12
12
|
/^inclusionai\/ling/,
|
|
13
|
+
/^inclusionai\/ring/,
|
|
13
14
|
/^anthropic\//,
|
|
14
15
|
/^openai\//,
|
|
15
16
|
/^google\/gemini/,
|
|
@@ -18,7 +19,8 @@ const TOOL_SUPPORT = [
|
|
|
18
19
|
/^qwen\//,
|
|
19
20
|
/^deepseek\//,
|
|
20
21
|
/^moonshotai\//,
|
|
21
|
-
|
|
22
|
+
// minimax intentionally omitted: OR's minimax emits XML tool calls (<minimax:tool_call>)
|
|
23
|
+
// instead of the standard JSON delta.tool_calls protocol, which leaks raw XML into the TUI.
|
|
22
24
|
/^z-ai\//,
|
|
23
25
|
/^tencent\//,
|
|
24
26
|
];
|
|
@@ -47,7 +49,7 @@ export class OpenRouterProvider {
|
|
|
47
49
|
// first byte on long prompts; multi-turn coding sprints need more
|
|
48
50
|
// headroom. 300 s leaves the timer well above legitimate latency
|
|
49
51
|
// without making a genuine hang invisible.
|
|
50
|
-
this.timeoutMs = config.timeoutMs ??
|
|
52
|
+
this.timeoutMs = config.timeoutMs ?? 90_000;
|
|
51
53
|
this.appName = config.appName ?? "dirgha-cli";
|
|
52
54
|
this.appUrl = config.appUrl ?? "https://dirgha.ai";
|
|
53
55
|
}
|
|
@@ -72,6 +74,7 @@ export class OpenRouterProvider {
|
|
|
72
74
|
maxTokens: req.maxTokens,
|
|
73
75
|
signal: req.signal,
|
|
74
76
|
timeoutMs: this.timeoutMs,
|
|
77
|
+
stallTimeoutMs: this.timeoutMs,
|
|
75
78
|
includeThinking: this.supportsThinking(req.model),
|
|
76
79
|
extraHeaders: {
|
|
77
80
|
"HTTP-Referer": this.appUrl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../src/providers/openrouter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,YAAY,GAAG,8BAA8B,CAAC;AAEpD,MAAM,YAAY,GAAG;IACnB,oBAAoB;IACpB,cAAc;IACd,WAAW;IACX,iBAAiB;IACjB,cAAc;IACd,eAAe;IACf,SAAS;IACT,aAAa;IACb,eAAe;IACf,
|
|
1
|
+
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../src/providers/openrouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
* Append-only, hash-chained audit log. Every entry is a JSON object
|
|
3
3
|
* carrying `prevHash` and `hash`; verify() walks the chain and detects
|
|
4
4
|
* tampering.
|
|
5
|
+
*
|
|
6
|
+
* The module also maintains an in-memory pending buffer so callers can
|
|
7
|
+
* drain recent entries at turn-end and push them to the gateway:
|
|
8
|
+
*
|
|
9
|
+
* const entries = await drainPending();
|
|
10
|
+
* await pushAuditEntries(sessionId, entries, token);
|
|
5
11
|
*/
|
|
6
12
|
export type AuditKind = 'tool_call' | 'approval' | 'policy_decision' | 'error' | 'model_call' | 'session_start' | 'session_end';
|
|
7
13
|
export interface AuditEntry {
|
|
@@ -25,3 +31,12 @@ export interface AuditLogOptions {
|
|
|
25
31
|
directory?: string;
|
|
26
32
|
}
|
|
27
33
|
export declare function createAuditLog(opts?: AuditLogOptions): AuditLog;
|
|
34
|
+
/**
|
|
35
|
+
* Return all audit entries written since the last call to `drainPending()`
|
|
36
|
+
* and clear the internal buffer.
|
|
37
|
+
*
|
|
38
|
+
* Designed for turn-end telemetry: the agent loop calls this after each
|
|
39
|
+
* turn and forwards the result to `pushAuditEntries()` for gateway upload.
|
|
40
|
+
* The function is synchronous in all but name — it never performs I/O.
|
|
41
|
+
*/
|
|
42
|
+
export declare function drainPending(): Promise<AuditEntry[]>;
|
package/dist/safety/audit-log.js
CHANGED
|
@@ -2,11 +2,19 @@
|
|
|
2
2
|
* Append-only, hash-chained audit log. Every entry is a JSON object
|
|
3
3
|
* carrying `prevHash` and `hash`; verify() walks the chain and detects
|
|
4
4
|
* tampering.
|
|
5
|
+
*
|
|
6
|
+
* The module also maintains an in-memory pending buffer so callers can
|
|
7
|
+
* drain recent entries at turn-end and push them to the gateway:
|
|
8
|
+
*
|
|
9
|
+
* const entries = await drainPending();
|
|
10
|
+
* await pushAuditEntries(sessionId, entries, token);
|
|
5
11
|
*/
|
|
6
12
|
import { appendFile, mkdir, readFile, stat } from 'node:fs/promises';
|
|
7
13
|
import { createHash, randomUUID } from 'node:crypto';
|
|
8
14
|
import { join } from 'node:path';
|
|
9
15
|
import { homedir } from 'node:os';
|
|
16
|
+
/** Module-level buffer — accumulates entries until `drainPending()` clears it. */
|
|
17
|
+
const _pendingBuffer = [];
|
|
10
18
|
export function createAuditLog(opts = {}) {
|
|
11
19
|
const dir = opts.directory ?? join(homedir(), '.dirgha', 'audit');
|
|
12
20
|
let lastHash = 'GENESIS';
|
|
@@ -25,6 +33,7 @@ export function createAuditLog(opts = {}) {
|
|
|
25
33
|
entry.hash = computeHash(lastHash, kind, entry.ts, sessionId, payload);
|
|
26
34
|
lastHash = entry.hash;
|
|
27
35
|
await appendFile(join(dir, fileFor()), `${JSON.stringify(entry)}\n`, 'utf8');
|
|
36
|
+
_pendingBuffer.push(entry);
|
|
28
37
|
},
|
|
29
38
|
async read(date) {
|
|
30
39
|
const path = join(dir, fileFor(date));
|
|
@@ -68,4 +77,16 @@ async function ensure(dir) {
|
|
|
68
77
|
if (!info)
|
|
69
78
|
await mkdir(dir, { recursive: true });
|
|
70
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Return all audit entries written since the last call to `drainPending()`
|
|
82
|
+
* and clear the internal buffer.
|
|
83
|
+
*
|
|
84
|
+
* Designed for turn-end telemetry: the agent loop calls this after each
|
|
85
|
+
* turn and forwards the result to `pushAuditEntries()` for gateway upload.
|
|
86
|
+
* The function is synchronous in all but name — it never performs I/O.
|
|
87
|
+
*/
|
|
88
|
+
export async function drainPending() {
|
|
89
|
+
const snapshot = _pendingBuffer.splice(0);
|
|
90
|
+
return snapshot;
|
|
91
|
+
}
|
|
71
92
|
//# sourceMappingURL=audit-log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../src/safety/audit-log.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../src/safety/audit-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ let telemetry = {
|
|
|
19
19
|
};
|
|
20
20
|
let warned = false;
|
|
21
21
|
let loaded = false;
|
|
22
|
+
let firstSuccess = true;
|
|
22
23
|
async function ensureLoaded() {
|
|
23
24
|
if (loaded)
|
|
24
25
|
return;
|
|
@@ -65,12 +66,21 @@ export function recordDbError(err) {
|
|
|
65
66
|
telemetry.lastErrorTime = new Date().toISOString();
|
|
66
67
|
if (!warned && telemetry.failedWrites >= 10) {
|
|
67
68
|
warned = true;
|
|
68
|
-
|
|
69
|
+
const suffix = telemetry.lastError
|
|
70
|
+
? ` (${telemetry.lastError})`
|
|
71
|
+
: "";
|
|
72
|
+
process.stderr.write(`[Dirgha] DB writes failing — session data may not persist.${suffix}\n`);
|
|
69
73
|
}
|
|
70
74
|
schedulePersist();
|
|
71
75
|
}
|
|
72
76
|
export function recordDbSuccess() {
|
|
73
77
|
void ensureLoaded();
|
|
78
|
+
if (firstSuccess) {
|
|
79
|
+
firstSuccess = false;
|
|
80
|
+
telemetry.failedWrites = 0;
|
|
81
|
+
// Do not reset `warned` — once printed, the warning stays printed
|
|
82
|
+
// to avoid re-arming on subsequent failure periods.
|
|
83
|
+
}
|
|
74
84
|
telemetry.totalWrites++;
|
|
75
85
|
schedulePersist();
|
|
76
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-telemetry.js","sourceRoot":"","sources":["../../src/state/db-telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AASlD,IAAI,SAAS,GAAoB;IAC/B,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,SAAS,EAAE,EAAE;IACb,aAAa,EAAE,EAAE;CAClB,CAAC;AAEF,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,IAAI,MAAM,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"db-telemetry.js","sourceRoot":"","sources":["../../src/state/db-telemetry.ts"],"names":[],"mappings":"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"}
|
package/dist/state/db.d.ts
CHANGED
|
@@ -9,6 +9,13 @@
|
|
|
9
9
|
* Uses better-sqlite3 for synchronous, zero-config SQLite.
|
|
10
10
|
*/
|
|
11
11
|
import type { Message } from "../kernel/types.js";
|
|
12
|
+
/**
|
|
13
|
+
* Stop the optional chokidar watcher and reset internal state. Used by
|
|
14
|
+
* tests that need to swap out the home directory between runs.
|
|
15
|
+
*/
|
|
16
|
+
export declare function _resetForTests(): Promise<void>;
|
|
17
|
+
/** Return the shared SQLite database handle, opening it if needed. */
|
|
18
|
+
export declare function openDb(): import("better-sqlite3").Database;
|
|
12
19
|
export declare function dbOpenSession(id: string, model?: string, cwd?: string): void;
|
|
13
20
|
export declare function dbCloseSession(id: string): void;
|
|
14
21
|
export declare function dbAppendMessage(sessionId: string, message: Message): void;
|
package/dist/state/db.js
CHANGED
|
@@ -11,27 +11,74 @@
|
|
|
11
11
|
import { join } from "node:path";
|
|
12
12
|
import { homedir } from "node:os";
|
|
13
13
|
import { mkdirSync } from "node:fs";
|
|
14
|
+
import { createRequire } from "node:module";
|
|
14
15
|
import { recordDbError, recordDbSuccess } from "./db-telemetry.js";
|
|
16
|
+
import { loadVecExtension } from "./vec.js";
|
|
17
|
+
import { bootstrapIndex, ensureIndexStateTable, } from "./sync-index.js";
|
|
18
|
+
const _require = createRequire(import.meta.url);
|
|
15
19
|
const DB_DIR = join(homedir(), ".dirgha");
|
|
16
20
|
const DB_PATH = join(DB_DIR, "dirgha.db");
|
|
17
21
|
// Lazy singleton — only opened when first needed.
|
|
18
22
|
let _db = null;
|
|
23
|
+
let _watcher = null;
|
|
24
|
+
let _indexBootstrapped = false;
|
|
19
25
|
function getDb() {
|
|
20
26
|
if (_db)
|
|
21
27
|
return _db;
|
|
22
28
|
try {
|
|
23
|
-
const Database =
|
|
29
|
+
const Database = _require("better-sqlite3");
|
|
24
30
|
mkdirSync(DB_DIR, { recursive: true });
|
|
25
31
|
_db = new Database(DB_PATH);
|
|
26
32
|
_db.pragma("journal_mode = WAL");
|
|
27
33
|
_db.pragma("synchronous = NORMAL");
|
|
28
|
-
|
|
29
|
-
|
|
34
|
+
const db = _db;
|
|
35
|
+
initSchema(db);
|
|
36
|
+
migrateSchema(db);
|
|
37
|
+
loadVecExtension(db);
|
|
38
|
+
ensureIndexStateTable(db);
|
|
39
|
+
bootstrapIndexOnce(db);
|
|
40
|
+
return db;
|
|
30
41
|
}
|
|
31
42
|
catch {
|
|
32
43
|
throw new Error(`SQLite unavailable (optional feature) — run "dirgha setup --features" to install.`);
|
|
33
44
|
}
|
|
34
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* First-call only: walk ~/.dirgha/memory and ~/.dirgha/knowledge into
|
|
48
|
+
* `embedding_meta`, and (if chokidar is installed) attach a watcher.
|
|
49
|
+
* Wrapped in a flag so re-entrant `openDb()` calls during startup don't
|
|
50
|
+
* trigger a second sync. Failures are swallowed — the SQLite index is
|
|
51
|
+
* a derived view and must never block CLI boot.
|
|
52
|
+
*/
|
|
53
|
+
function bootstrapIndexOnce(db) {
|
|
54
|
+
if (_indexBootstrapped)
|
|
55
|
+
return;
|
|
56
|
+
_indexBootstrapped = true;
|
|
57
|
+
try {
|
|
58
|
+
const { watcher } = bootstrapIndex(db);
|
|
59
|
+
_watcher = watcher;
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
recordDbError(err);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Stop the optional chokidar watcher and reset internal state. Used by
|
|
67
|
+
* tests that need to swap out the home directory between runs.
|
|
68
|
+
*/
|
|
69
|
+
export async function _resetForTests() {
|
|
70
|
+
if (_watcher) {
|
|
71
|
+
try {
|
|
72
|
+
await _watcher.close();
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
/* swallow */
|
|
76
|
+
}
|
|
77
|
+
_watcher = null;
|
|
78
|
+
}
|
|
79
|
+
_indexBootstrapped = false;
|
|
80
|
+
_db = null;
|
|
81
|
+
}
|
|
35
82
|
function initSchema(db) {
|
|
36
83
|
db.exec(`
|
|
37
84
|
CREATE TABLE IF NOT EXISTS sessions (
|
|
@@ -58,8 +105,105 @@ function initSchema(db) {
|
|
|
58
105
|
INSERT INTO messages_fts(rowid, content, session_id, role)
|
|
59
106
|
VALUES (new.id, new.content, new.session_id, new.role);
|
|
60
107
|
END;
|
|
108
|
+
|
|
109
|
+
-- Sprint 3 graph schema (docs/cli/index/agent-db.md).
|
|
110
|
+
-- graph_nodes + graph_edges with directed labelled edges.
|
|
111
|
+
CREATE TABLE IF NOT EXISTS graph_nodes (
|
|
112
|
+
id TEXT PRIMARY KEY,
|
|
113
|
+
type TEXT NOT NULL,
|
|
114
|
+
props TEXT,
|
|
115
|
+
ts INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
|
|
116
|
+
);
|
|
117
|
+
CREATE TABLE IF NOT EXISTS graph_edges (
|
|
118
|
+
src TEXT NOT NULL,
|
|
119
|
+
dst TEXT NOT NULL,
|
|
120
|
+
rel TEXT NOT NULL,
|
|
121
|
+
props TEXT,
|
|
122
|
+
ts INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
|
|
123
|
+
PRIMARY KEY (src, dst, rel),
|
|
124
|
+
FOREIGN KEY (src) REFERENCES graph_nodes(id) ON DELETE CASCADE,
|
|
125
|
+
FOREIGN KEY (dst) REFERENCES graph_nodes(id) ON DELETE CASCADE
|
|
126
|
+
);
|
|
127
|
+
CREATE INDEX IF NOT EXISTS idx_edges_src ON graph_edges(src, rel);
|
|
128
|
+
CREATE INDEX IF NOT EXISTS idx_edges_dst ON graph_edges(dst, rel);
|
|
129
|
+
CREATE INDEX IF NOT EXISTS idx_nodes_type ON graph_nodes(type);
|
|
61
130
|
`);
|
|
62
131
|
}
|
|
132
|
+
/**
|
|
133
|
+
* Idempotent schema migration for existing databases from earlier CLI
|
|
134
|
+
* versions. Adds missing columns without data loss; backfills ts from
|
|
135
|
+
* the legacy created_at text column when present.
|
|
136
|
+
*
|
|
137
|
+
* Failures are captured via recordDbError but never thrown — the CLI
|
|
138
|
+
* must continue to work without DB persistence rather than crash.
|
|
139
|
+
*/
|
|
140
|
+
function migrateSchema(db) {
|
|
141
|
+
try {
|
|
142
|
+
// messages: add ts if it doesn't exist
|
|
143
|
+
const msgCols = db.pragma("table_info(messages)");
|
|
144
|
+
const hasTs = msgCols.some((c) => c.name === "ts");
|
|
145
|
+
const hasCreatedAt = msgCols.some((c) => c.name === "created_at");
|
|
146
|
+
if (!hasTs) {
|
|
147
|
+
db.exec("ALTER TABLE messages ADD COLUMN ts INTEGER NOT NULL DEFAULT 0");
|
|
148
|
+
}
|
|
149
|
+
if (hasCreatedAt) {
|
|
150
|
+
// Backfill ts from legacy text timestamp (once, for rows still at 0).
|
|
151
|
+
db.exec("UPDATE messages SET ts = CAST(strftime('%s', created_at) * 1000 AS INTEGER) WHERE ts = 0 AND created_at IS NOT NULL");
|
|
152
|
+
}
|
|
153
|
+
// sessions: align legacy schemas (some predate the current column set).
|
|
154
|
+
// Earlier CLI versions wrote sessions(id, title, model, tokens,
|
|
155
|
+
// created_at, updated_at, working_dir, ...) — but dbOpenSession's
|
|
156
|
+
// INSERT lists `cwd` and `started_at`. Add any missing columns.
|
|
157
|
+
const sessCols = db.pragma("table_info(sessions)");
|
|
158
|
+
const sessNames = new Set(sessCols.map((c) => c.name));
|
|
159
|
+
if (!sessNames.has("started_at")) {
|
|
160
|
+
db.exec("ALTER TABLE sessions ADD COLUMN started_at INTEGER NOT NULL DEFAULT 0");
|
|
161
|
+
}
|
|
162
|
+
if (!sessNames.has("cwd")) {
|
|
163
|
+
// Default to '' so the NOT-NULL semantics aren't a problem; if the
|
|
164
|
+
// legacy column `working_dir` exists, copy it across as a one-shot.
|
|
165
|
+
db.exec("ALTER TABLE sessions ADD COLUMN cwd TEXT");
|
|
166
|
+
if (sessNames.has("working_dir")) {
|
|
167
|
+
db.exec("UPDATE sessions SET cwd = working_dir WHERE cwd IS NULL AND working_dir IS NOT NULL");
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (!sessNames.has("model")) {
|
|
171
|
+
db.exec("ALTER TABLE sessions ADD COLUMN model TEXT");
|
|
172
|
+
}
|
|
173
|
+
if (!sessNames.has("ended_at")) {
|
|
174
|
+
db.exec("ALTER TABLE sessions ADD COLUMN ended_at INTEGER");
|
|
175
|
+
}
|
|
176
|
+
// Ensure graph tables exist for DBs created before Sprint 3.
|
|
177
|
+
db.exec(`
|
|
178
|
+
CREATE TABLE IF NOT EXISTS graph_nodes (
|
|
179
|
+
id TEXT PRIMARY KEY,
|
|
180
|
+
type TEXT NOT NULL,
|
|
181
|
+
props TEXT,
|
|
182
|
+
ts INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
|
|
183
|
+
);
|
|
184
|
+
CREATE TABLE IF NOT EXISTS graph_edges (
|
|
185
|
+
src TEXT NOT NULL,
|
|
186
|
+
dst TEXT NOT NULL,
|
|
187
|
+
rel TEXT NOT NULL,
|
|
188
|
+
props TEXT,
|
|
189
|
+
ts INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
|
|
190
|
+
PRIMARY KEY (src, dst, rel),
|
|
191
|
+
FOREIGN KEY (src) REFERENCES graph_nodes(id) ON DELETE CASCADE,
|
|
192
|
+
FOREIGN KEY (dst) REFERENCES graph_nodes(id) ON DELETE CASCADE
|
|
193
|
+
);
|
|
194
|
+
CREATE INDEX IF NOT EXISTS idx_edges_src ON graph_edges(src, rel);
|
|
195
|
+
CREATE INDEX IF NOT EXISTS idx_edges_dst ON graph_edges(dst, rel);
|
|
196
|
+
CREATE INDEX IF NOT EXISTS idx_nodes_type ON graph_nodes(type);
|
|
197
|
+
`);
|
|
198
|
+
}
|
|
199
|
+
catch (err) {
|
|
200
|
+
recordDbError(err);
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
/** Return the shared SQLite database handle, opening it if needed. */
|
|
204
|
+
export function openDb() {
|
|
205
|
+
return getDb();
|
|
206
|
+
}
|
|
63
207
|
export function dbOpenSession(id, model, cwd) {
|
|
64
208
|
try {
|
|
65
209
|
const db = getDb();
|
package/dist/state/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/state/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/state/db.ts"],"names":[],"mappings":"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"}
|
package/dist/state/index.js
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* cross-references sessions, checkpoints, and cron jobs by session ID.
|
|
4
4
|
* All writes are atomic (write to tmp, rename).
|
|
5
5
|
*/
|
|
6
|
-
import { readFile, writeFile, mkdir } from 'node:fs/promises';
|
|
7
|
-
import { homedir
|
|
6
|
+
import { readFile, writeFile, mkdir, rename } from 'node:fs/promises';
|
|
7
|
+
import { homedir } from 'node:os';
|
|
8
8
|
import { join } from 'node:path';
|
|
9
9
|
import { randomUUID } from 'node:crypto';
|
|
10
10
|
const STATE_DIR = join(homedir(), '.dirgha');
|
|
@@ -20,9 +20,13 @@ async function readIndex() {
|
|
|
20
20
|
}
|
|
21
21
|
async function writeIndex(index) {
|
|
22
22
|
await mkdir(STATE_DIR, { recursive: true });
|
|
23
|
-
|
|
23
|
+
// Write to a tmp file in the SAME directory as INDEX_PATH so that the
|
|
24
|
+
// subsequent rename(2) is within one filesystem. Writing to os.tmpdir()
|
|
25
|
+
// would cause an EXDEV error on Linux when /tmp is a tmpfs while ~/.dirgha
|
|
26
|
+
// is on the root filesystem.
|
|
27
|
+
const tmp = join(STATE_DIR, `.dirgha-state-${randomUUID()}.tmp`);
|
|
24
28
|
await writeFile(tmp, JSON.stringify(index, null, 2), 'utf8');
|
|
25
|
-
await
|
|
29
|
+
await rename(tmp, INDEX_PATH);
|
|
26
30
|
}
|
|
27
31
|
export async function registerSession(sessionId, model) {
|
|
28
32
|
try {
|
package/dist/state/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/state/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/state/index.ts"],"names":[],"mappings":"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"}
|