@dirgha/code 1.23.0 → 1.24.1
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/dist/cli/flows/wizard.js +1 -0
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +16 -0
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +14 -6
- 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 +9 -2
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +335 -5
- package/dist/cli/slash/models.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/context/_fts.js +4 -1
- package/dist/context/_fts.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/intelligence/prices.js +9 -1
- 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 +46 -10
- 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/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/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +10 -1
- 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 +5 -0
- package/dist/providers/index.js +14 -0
- 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/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +30 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +4 -1
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/state/db.js +22 -0
- 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/tools/checkpoint.js +16 -2
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/git.js +2 -1
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/multimodal.js +21 -5
- 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/rtk.js +8 -2
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.js +10 -6
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/shell.js +5 -5
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +31 -7
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +32 -7
- package/dist/tui/ink/components/InputBox.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/StatusBar.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -9
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/index.js +19 -13
- 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/use-overlays.js +13 -9
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +43 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +9 -5
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/package.json +3 -2
|
@@ -56,6 +56,14 @@ const RULES = [
|
|
|
56
56
|
// Specific NVIDIA NIM models — after explicit prefixes so vendor-prefix
|
|
57
57
|
// deepseek/ai/, anthropic/, etc. are never hijacked by the NIM catalogue.
|
|
58
58
|
{ match: (id) => NVIDIA_NIM_MODELS.has(id), provider: "nvidia" },
|
|
59
|
+
// Machine 1 — Dirgha's local industrial intelligence model.
|
|
60
|
+
// Matches "machine1", "machine1:latest", and the explicit "machine1/" prefix.
|
|
61
|
+
{
|
|
62
|
+
match: (id) => id === "machine1" ||
|
|
63
|
+
id === "machine1:latest" ||
|
|
64
|
+
id.startsWith("machine1/"),
|
|
65
|
+
provider: "machine1",
|
|
66
|
+
},
|
|
59
67
|
// Local & explicit-prefix providers.
|
|
60
68
|
{ match: (id) => id.startsWith("ollama/"), provider: "ollama" },
|
|
61
69
|
{ match: (id) => id.startsWith("llamacpp/"), provider: "llamacpp" },
|
|
@@ -117,6 +125,7 @@ export function isKnownProvider(id) {
|
|
|
117
125
|
id === "perplexity" ||
|
|
118
126
|
id === "xai" ||
|
|
119
127
|
id === "groq" ||
|
|
120
|
-
id === "zai"
|
|
128
|
+
id === "zai" ||
|
|
129
|
+
id === "machine1");
|
|
121
130
|
}
|
|
122
131
|
//# sourceMappingURL=dispatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,10 @@ const FAMILIES = {
|
|
|
37
37
|
{ provider: "openrouter", model: "minimax/minimax-m2.7" },
|
|
38
38
|
{ provider: "openrouter", model: "minimax/minimax-m2.5:free" },
|
|
39
39
|
],
|
|
40
|
+
ring: [
|
|
41
|
+
{ provider: "openrouter", model: "inclusionai/ring-2.6-1t:free" },
|
|
42
|
+
{ provider: "openrouter", model: "inclusionai/ling-2.6-1t:free" },
|
|
43
|
+
],
|
|
40
44
|
mistral: [
|
|
41
45
|
{ provider: "mistral", model: "mistral-large-2" },
|
|
42
46
|
{ provider: "openrouter", model: "mistralai/mistral-large-2512" },
|
|
@@ -55,6 +59,7 @@ const FAMILY_PATTERNS = [
|
|
|
55
59
|
},
|
|
56
60
|
{ family: "qwen", test: (id) => id.includes("qwen") },
|
|
57
61
|
{ family: "minimax", test: (id) => id.includes("minimax") },
|
|
62
|
+
{ family: "ring", test: (id) => id.includes("ring") && id.includes("inclusionai") },
|
|
58
63
|
{ family: "mistral", test: (id) => id.includes("mistral") },
|
|
59
64
|
];
|
|
60
65
|
export function detectFamily(modelId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"family-fallback.js","sourceRoot":"","sources":["../../src/providers/family-fallback.ts"],"names":[],"mappings":"AAQA,+EAA+E;AAC/E,MAAM,QAAQ,GAGV;IACF,MAAM,EAAE;QACN,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,6BAA6B,EAAE;QAChE,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,4BAA4B,EAAE;KAChE;IACD,GAAG,EAAE;QACH,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB,EAAE;QACnD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,qBAAqB,EAAE;KACzD;IACD,MAAM,EAAE;QACN,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,+BAA+B,EAAE;QAClE,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,sCAAsC,EAAE;KAC1E;IACD,KAAK,EAAE;QACL,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,yBAAyB,EAAE;QACtD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,mCAAmC,EAAE;QACtE,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,6BAA6B,EAAE;KACjE;IACD,QAAQ,EAAE;QACR,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE;QAChD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,wBAAwB,EAAE;QAC3D,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,0BAA0B,EAAE;KAC9D;IACD,IAAI,EAAE;QACJ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,sBAAsB,EAAE;QACrD,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,6BAA6B,EAAE;QAC5D,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,EAAE;KAC1D;IACD,IAAI,EAAE;QACJ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,qCAAqC,EAAE;QACpE,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE;QACrD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,4BAA4B,EAAE;KAChE;IACD,OAAO,EAAE;QACP,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,wBAAwB,EAAE;QACvD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,EAAE;QACzD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,2BAA2B,EAAE;KAC/D;IACD,OAAO,EAAE;QACP,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,iBAAiB,EAAE;QACjD,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,8BAA8B,EAAE;QACjE,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,8BAA8B,EAAE;KAClE;CACF,CAAC;AAEF,MAAM,eAAe,GAGhB;IACH,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;IACzD,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;IAC7D,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;IACzD,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;IACvD,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;IAC7D;QACE,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;KAC/D;IACD,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;IACrD,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;IAC3D,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;CAC5D,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,eAAe,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,OAAO,CAAC;YAAE,OAAO,MAAM,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,eAA4B;IAE5B,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,eAAe,CAAC,CAAC;AACxE,CAAC"}
|
|
1
|
+
{"version":3,"file":"family-fallback.js","sourceRoot":"","sources":["../../src/providers/family-fallback.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/gemini.js
CHANGED
|
@@ -149,6 +149,19 @@ function makeTimeoutSignal(timeoutMs, external) {
|
|
|
149
149
|
};
|
|
150
150
|
}
|
|
151
151
|
function buildGeminiBody(req, thinkingParam = null) {
|
|
152
|
+
// Build toolUseId → toolName map from all assistant messages so tool_result
|
|
153
|
+
// parts can emit the correct functionResponse.name (Gemini requires the
|
|
154
|
+
// function name, not the call ID, to correlate responses to declarations).
|
|
155
|
+
const toolIdToName = new Map();
|
|
156
|
+
for (const msg of req.messages) {
|
|
157
|
+
if (msg.role !== 'assistant')
|
|
158
|
+
continue;
|
|
159
|
+
const raw = typeof msg.content === 'string' ? [] : msg.content;
|
|
160
|
+
for (const p of raw) {
|
|
161
|
+
if (p.type === 'tool_use')
|
|
162
|
+
toolIdToName.set(p.id, p.name);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
152
165
|
const contents = [];
|
|
153
166
|
let systemInstruction;
|
|
154
167
|
for (const msg of req.messages) {
|
|
@@ -162,10 +175,27 @@ function buildGeminiBody(req, thinkingParam = null) {
|
|
|
162
175
|
const parts = [];
|
|
163
176
|
const raw = typeof msg.content === 'string' ? [{ type: 'text', text: msg.content }] : msg.content;
|
|
164
177
|
for (const p of raw) {
|
|
165
|
-
if (p.type === 'text')
|
|
178
|
+
if (p.type === 'text') {
|
|
166
179
|
parts.push({ text: p.text });
|
|
167
|
-
|
|
168
|
-
|
|
180
|
+
}
|
|
181
|
+
else if (p.type === 'tool_use') {
|
|
182
|
+
// Bug 2: assistant tool_use parts must become functionCall entries;
|
|
183
|
+
// previously they were silently dropped, producing parts:[] → HTTP 400.
|
|
184
|
+
parts.push({ functionCall: { name: p.name, args: p.input ?? {} } });
|
|
185
|
+
}
|
|
186
|
+
else if (p.type === 'tool_result') {
|
|
187
|
+
// Bug 3: tool results must be functionResponse, not plain text.
|
|
188
|
+
// Gemini requires the original function declaration name (e.g. "get_weather"),
|
|
189
|
+
// not the call ID (e.g. "toolu_01ABC"), to correlate the response.
|
|
190
|
+
// Fall back to toolUseId if the map has no entry (graceful degradation).
|
|
191
|
+
const resolvedName = toolIdToName.get(p.toolUseId ?? '') ?? p.toolUseId ?? '';
|
|
192
|
+
parts.push({
|
|
193
|
+
functionResponse: {
|
|
194
|
+
name: resolvedName,
|
|
195
|
+
response: { result: p.content },
|
|
196
|
+
},
|
|
197
|
+
});
|
|
198
|
+
}
|
|
169
199
|
}
|
|
170
200
|
contents.push({ role: msg.role === 'assistant' ? 'model' : 'user', parts });
|
|
171
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,YAAY,GAAG,kDAAkD,CAAC;AAExE,MAAM,OAAO,cAAc;IAChB,EAAE,GAAG,QAAQ,CAAC;IACN,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,SAAS,CAAS;IAEnC,YAAY,MAAsB;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;QAC9F,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,aAAa,CAAC,8CAA8C,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACnG,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,QAAgB;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;QACxE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,GAAkB;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,kBAAkB,KAAK,sCAAsC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1H,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,CAAC;QAC/F,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,KAAK,EAAE,CAAC,EAAE,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxG,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAEjD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC1B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE;gBAC5E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,EAAE,CAAC;YACT,MAAM,IAAI,aAAa,CAAC,kBAAkB,MAAM,CAAE,GAAa,EAAE,OAAO,IAAI,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAChH,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACnD,MAAM,EAAE,CAAC;YACT,MAAM,IAAI,aAAa,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;QAC3I,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,EAAE,CAAC;YACT,MAAM,IAAI,aAAa,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,IAAI,CAAC;YACH,SAAS,CAAC;gBACR,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI;oBAAE,MAAM;gBAChB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAElD,IAAI,EAAU,CAAC;gBACf,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAChC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBACzD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;wBAAE,SAAS;oBACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO;wBAAE,SAAS;oBACvB,IAAI,KAAwB,CAAC;oBAC7B,IAAI,CAAC;wBAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC;wBAAC,SAAS;oBAAC,CAAC;oBAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;oBACxC,IAAI,CAAC,SAAS;wBAAE,SAAS;oBACzB,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;wBAClD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;4BACd,IAAI,CAAC,QAAQ,EAAE,CAAC;gCAAC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;gCAAC,QAAQ,GAAG,IAAI,CAAC;4BAAC,CAAC;4BACjE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;wBACjD,CAAC;6BAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;4BAC7B,IAAI,QAAQ,EAAE,CAAC;gCAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gCAAC,QAAQ,GAAG,KAAK,CAAC;4BAAC,CAAC;4BAC/D,MAAM,EAAE,GAAG,MAAM,SAAS,EAAE,EAAE,CAAC;4BAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;4BACpC,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;4BAC3C,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;wBAC1E,CAAC;oBACH,CAAC;oBACD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;wBACxB,MAAM;4BACJ,IAAI,EAAE,OAAO;4BACb,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,gBAAgB,IAAI,CAAC;4BACtD,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,oBAAoB,IAAI,CAAC;4BAC3D,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,uBAAuB,IAAI,CAAC;yBAC/D,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,QAAQ;gBAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QAC3C,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC;YACT,IAAI,CAAC;gBAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,SAAiB,EAAE,QAAsB;IAClE,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,2BAA2B,SAAS,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IACjH,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAE,QAAwB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,QAAQ,CAAC,OAAO;YAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;;YACnD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,MAAM,EAAE,GAAG,EAAE;YACX,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,QAAQ;gBAAE,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClE,CAAC;KACF,CAAC;AACJ,CAAC;AAcD,SAAS,eAAe,CAAC,GAAkB,EAAE,gBAAgD,IAAI;IAC/F,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@
|
|
|
7
7
|
import type { Provider, ProviderConfig } from "./iface.js";
|
|
8
8
|
import { type ProviderId } from "./dispatch.js";
|
|
9
9
|
import { type RateLimitOptions } from "./rate-limiter.js";
|
|
10
|
+
import { CUSTOM_PROVIDERS } from "./custom-provider.js";
|
|
11
|
+
export type { CustomProviderEntry } from "./custom-provider.js";
|
|
12
|
+
export { CUSTOM_PROVIDERS };
|
|
10
13
|
export * from "./iface.js";
|
|
11
14
|
export * from "./dispatch.js";
|
|
12
15
|
export { NvidiaProvider } from "./nvidia.js";
|
|
@@ -16,6 +19,7 @@ export { AnthropicProvider } from "./anthropic.js";
|
|
|
16
19
|
export { GeminiProvider } from "./gemini.js";
|
|
17
20
|
export { OllamaProvider } from "./ollama.js";
|
|
18
21
|
export { LlamaCppProvider } from "./llamacpp.js";
|
|
22
|
+
export { Machine1Provider } from "./machine1.js";
|
|
19
23
|
export { FireworksProvider } from "./fireworks.js";
|
|
20
24
|
export { DeepSeekProvider } from "./deepseek.js";
|
|
21
25
|
export interface ProviderRegistryConfig {
|
|
@@ -43,6 +47,7 @@ export interface ProviderRegistryConfig {
|
|
|
43
47
|
xai?: ProviderConfig;
|
|
44
48
|
groq?: ProviderConfig;
|
|
45
49
|
zai?: ProviderConfig;
|
|
50
|
+
machine1?: ProviderConfig;
|
|
46
51
|
rateLimit?: RateLimitOptions;
|
|
47
52
|
}
|
|
48
53
|
export declare class ProviderRegistry {
|
package/dist/providers/index.js
CHANGED
|
@@ -12,10 +12,13 @@ import { AnthropicProvider } from "./anthropic.js";
|
|
|
12
12
|
import { GeminiProvider } from "./gemini.js";
|
|
13
13
|
import { OllamaProvider } from "./ollama.js";
|
|
14
14
|
import { LlamaCppProvider } from "./llamacpp.js";
|
|
15
|
+
import { Machine1Provider } from "./machine1.js";
|
|
15
16
|
import { FireworksProvider } from "./fireworks.js";
|
|
16
17
|
import { DeepSeekProvider } from "./deepseek.js";
|
|
17
18
|
import { MistralProvider, CohereProvider, CerebrasProvider, TogetherProvider, PerplexityProvider, XaiProvider, GroqProvider, ZaiProvider, } from "./extra-providers.js";
|
|
18
19
|
import { withRateLimit } from "./rate-limiter.js";
|
|
20
|
+
import { CUSTOM_PROVIDERS } from "./custom-provider.js";
|
|
21
|
+
export { CUSTOM_PROVIDERS };
|
|
19
22
|
export * from "./iface.js";
|
|
20
23
|
export * from "./dispatch.js";
|
|
21
24
|
export { NvidiaProvider } from "./nvidia.js";
|
|
@@ -25,6 +28,7 @@ export { AnthropicProvider } from "./anthropic.js";
|
|
|
25
28
|
export { GeminiProvider } from "./gemini.js";
|
|
26
29
|
export { OllamaProvider } from "./ollama.js";
|
|
27
30
|
export { LlamaCppProvider } from "./llamacpp.js";
|
|
31
|
+
export { Machine1Provider } from "./machine1.js";
|
|
28
32
|
export { FireworksProvider } from "./fireworks.js";
|
|
29
33
|
export { DeepSeekProvider } from "./deepseek.js";
|
|
30
34
|
export class ProviderRegistry {
|
|
@@ -50,6 +54,14 @@ export class ProviderRegistry {
|
|
|
50
54
|
this.cacheTime.clear();
|
|
51
55
|
}
|
|
52
56
|
forModel(modelId) {
|
|
57
|
+
// Custom providers: keyed by prefix "<customId>/" — check before built-in routing.
|
|
58
|
+
const slash = modelId.indexOf("/");
|
|
59
|
+
if (slash !== -1) {
|
|
60
|
+
const prefix = modelId.slice(0, slash);
|
|
61
|
+
const custom = CUSTOM_PROVIDERS.get(prefix);
|
|
62
|
+
if (custom)
|
|
63
|
+
return custom;
|
|
64
|
+
}
|
|
53
65
|
const id = routeModel(modelId);
|
|
54
66
|
const cached = this.cache.get(id);
|
|
55
67
|
if (cached) {
|
|
@@ -110,6 +122,8 @@ export class ProviderRegistry {
|
|
|
110
122
|
return new GroqProvider(this.config.groq ?? {});
|
|
111
123
|
case "zai":
|
|
112
124
|
return new ZaiProvider(this.config.zai ?? {});
|
|
125
|
+
case "machine1":
|
|
126
|
+
return new Machine1Provider(this.config.machine1 ?? {});
|
|
113
127
|
}
|
|
114
128
|
}
|
|
115
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,UAAU,EAAmB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Machine 1 provider — Dirgha's industrial intelligence model.
|
|
3
|
+
*
|
|
4
|
+
* Uses llama-cli (llama.cpp) for fully local, offline inference.
|
|
5
|
+
* No Ollama. No server process. No cloud. No GPU required.
|
|
6
|
+
* A single GGUF (~350MB Q4_K_M) runs on any laptop CPU.
|
|
7
|
+
*
|
|
8
|
+
* Request flow:
|
|
9
|
+
* 1. Locate llama-cli binary and machine1 GGUF.
|
|
10
|
+
* 2. Build a ChatML-formatted prompt from the conversation history.
|
|
11
|
+
* 3. (Optional) Query Qdrant codex collection for relevant machine context.
|
|
12
|
+
* 4. Spawn llama-cli, stream stdout tokens as text_delta events.
|
|
13
|
+
* 5. Prefix every response with "[Machine 1]".
|
|
14
|
+
*
|
|
15
|
+
* Environment overrides:
|
|
16
|
+
* MACHINE1_MODEL_PATH — absolute path to .gguf file
|
|
17
|
+
* LLAMA_CLI_PATH — path to llama-cli binary
|
|
18
|
+
* QDRANT_URL — Qdrant base URL (default: http://localhost:6333)
|
|
19
|
+
*/
|
|
20
|
+
import type { AgentEvent, StreamRequest } from '../kernel/types.js';
|
|
21
|
+
import type { Provider, ProviderConfig } from './iface.js';
|
|
22
|
+
export declare class Machine1Provider implements Provider {
|
|
23
|
+
readonly id = "machine1";
|
|
24
|
+
private readonly timeoutMs;
|
|
25
|
+
constructor(config: ProviderConfig);
|
|
26
|
+
supportsTools(_modelId: string): boolean;
|
|
27
|
+
supportsThinking(_modelId: string): boolean;
|
|
28
|
+
stream(req: StreamRequest): AsyncIterable<AgentEvent>;
|
|
29
|
+
private _stream;
|
|
30
|
+
}
|
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Machine 1 provider — Dirgha's industrial intelligence model.
|
|
3
|
+
*
|
|
4
|
+
* Uses llama-cli (llama.cpp) for fully local, offline inference.
|
|
5
|
+
* No Ollama. No server process. No cloud. No GPU required.
|
|
6
|
+
* A single GGUF (~350MB Q4_K_M) runs on any laptop CPU.
|
|
7
|
+
*
|
|
8
|
+
* Request flow:
|
|
9
|
+
* 1. Locate llama-cli binary and machine1 GGUF.
|
|
10
|
+
* 2. Build a ChatML-formatted prompt from the conversation history.
|
|
11
|
+
* 3. (Optional) Query Qdrant codex collection for relevant machine context.
|
|
12
|
+
* 4. Spawn llama-cli, stream stdout tokens as text_delta events.
|
|
13
|
+
* 5. Prefix every response with "[Machine 1]".
|
|
14
|
+
*
|
|
15
|
+
* Environment overrides:
|
|
16
|
+
* MACHINE1_MODEL_PATH — absolute path to .gguf file
|
|
17
|
+
* LLAMA_CLI_PATH — path to llama-cli binary
|
|
18
|
+
* QDRANT_URL — Qdrant base URL (default: http://localhost:6333)
|
|
19
|
+
*/
|
|
20
|
+
import { spawn } from 'child_process';
|
|
21
|
+
import { existsSync } from 'fs';
|
|
22
|
+
import { homedir } from 'os';
|
|
23
|
+
import { join } from 'path';
|
|
24
|
+
import { ProviderError } from './iface.js';
|
|
25
|
+
// ── Binary / model search paths ───────────────────────────────────────
|
|
26
|
+
const LLAMA_CLI_CANDIDATES = [
|
|
27
|
+
process.env['LLAMA_CLI_PATH'] ?? '',
|
|
28
|
+
'llama-cli',
|
|
29
|
+
'/usr/local/bin/llama-cli',
|
|
30
|
+
'/opt/homebrew/bin/llama-cli',
|
|
31
|
+
join(homedir(), '.local', 'bin', 'llama-cli'),
|
|
32
|
+
'llama.cpp/build/bin/llama-cli',
|
|
33
|
+
'build/bin/llama-cli',
|
|
34
|
+
].filter(Boolean);
|
|
35
|
+
const GGUF_CANDIDATES = [
|
|
36
|
+
process.env['MACHINE1_MODEL_PATH'] ?? '',
|
|
37
|
+
join(homedir(), '.dirgha', 'machine1-q4_k_m.gguf'),
|
|
38
|
+
join(homedir(), '.dirgha', 'machine1.gguf'),
|
|
39
|
+
join(homedir(), 'models', 'machine1-q4_k_m.gguf'),
|
|
40
|
+
'/var/lib/dirgha/machine1-q4_k_m.gguf',
|
|
41
|
+
'models/machine1-q4_k_m.gguf',
|
|
42
|
+
].filter(Boolean);
|
|
43
|
+
const QDRANT_BASE = process.env['QDRANT_URL'] ?? 'http://localhost:6333';
|
|
44
|
+
const CODEX_COLLECTIONS = ['codex', 'dirgha_codex'];
|
|
45
|
+
// ── ChatML tokens (Qwen2.5 / Machine 1 format) ───────────────────────
|
|
46
|
+
const IM_START = '<|im_start|>';
|
|
47
|
+
const IM_END = '<|im_end|>';
|
|
48
|
+
const EOT = '<|endoftext|>';
|
|
49
|
+
const DEFAULT_SYSTEM = `You are Machine 1, India's industrial intelligence model built by Dirgha AI.
|
|
50
|
+
You are the expert that India's manufacturing sector has never had.
|
|
51
|
+
You know every machine India needs: operating principles, key specifications, Indian manufacturers, import dependencies, PLI scheme linkages, BIS standards, HS codes, and pricing.
|
|
52
|
+
Answer in plain language. Be specific — name exact companies, models, prices, percentages. Never hallucinate a spec or invent a company. If you don't know, say so clearly.`;
|
|
53
|
+
// ── Helpers ───────────────────────────────────────────────────────────
|
|
54
|
+
function findBinary(candidates) {
|
|
55
|
+
for (const c of candidates) {
|
|
56
|
+
if (!c)
|
|
57
|
+
continue;
|
|
58
|
+
if (c.includes('/')) {
|
|
59
|
+
if (existsSync(c))
|
|
60
|
+
return c;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
return c; // bare name — rely on PATH resolution at spawn time
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
function findGguf(candidates) {
|
|
69
|
+
for (const c of candidates) {
|
|
70
|
+
if (c && existsSync(c))
|
|
71
|
+
return c;
|
|
72
|
+
}
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
function extractText(content) {
|
|
76
|
+
if (typeof content === 'string')
|
|
77
|
+
return content;
|
|
78
|
+
const parts = [];
|
|
79
|
+
for (const p of content) {
|
|
80
|
+
if (p.type === 'text')
|
|
81
|
+
parts.push(p.text);
|
|
82
|
+
else if (p.type === 'thinking')
|
|
83
|
+
parts.push(p.text);
|
|
84
|
+
else if (p.type === 'tool_result')
|
|
85
|
+
parts.push(`[Tool result: ${p.content}]`);
|
|
86
|
+
}
|
|
87
|
+
return parts.join('\n');
|
|
88
|
+
}
|
|
89
|
+
function lastUserText(messages) {
|
|
90
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
91
|
+
const m = messages[i];
|
|
92
|
+
if (m.role === 'user')
|
|
93
|
+
return extractText(m.content);
|
|
94
|
+
}
|
|
95
|
+
return '';
|
|
96
|
+
}
|
|
97
|
+
// ── ChatML prompt builder ─────────────────────────────────────────────
|
|
98
|
+
function buildChatML(messages, codexContext) {
|
|
99
|
+
const parts = [];
|
|
100
|
+
// Merge all system messages + default + codex context
|
|
101
|
+
let systemText = DEFAULT_SYSTEM;
|
|
102
|
+
const nonSystem = [];
|
|
103
|
+
for (const m of messages) {
|
|
104
|
+
if (m.role === 'system') {
|
|
105
|
+
const text = extractText(m.content);
|
|
106
|
+
if (text)
|
|
107
|
+
systemText += '\n\n' + text;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
nonSystem.push(m);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
if (codexContext)
|
|
114
|
+
systemText = codexContext + '\n\n' + systemText;
|
|
115
|
+
parts.push(`${IM_START}system\n${systemText}${IM_END}\n`);
|
|
116
|
+
for (const m of nonSystem) {
|
|
117
|
+
const text = extractText(m.content);
|
|
118
|
+
if (m.role === 'user') {
|
|
119
|
+
parts.push(`${IM_START}user\n${text}${IM_END}\n`);
|
|
120
|
+
}
|
|
121
|
+
else if (m.role === 'assistant') {
|
|
122
|
+
parts.push(`${IM_START}assistant\n${text}${IM_END}\n`);
|
|
123
|
+
}
|
|
124
|
+
// tool roles are skipped — llama.cpp doesn't support them
|
|
125
|
+
}
|
|
126
|
+
// Open the assistant turn for generation
|
|
127
|
+
parts.push(`${IM_START}assistant\n`);
|
|
128
|
+
return parts.join('');
|
|
129
|
+
}
|
|
130
|
+
async function resolveQdrantCollection() {
|
|
131
|
+
try {
|
|
132
|
+
const res = await fetch(`${QDRANT_BASE}/collections`, {
|
|
133
|
+
signal: AbortSignal.timeout(3_000),
|
|
134
|
+
});
|
|
135
|
+
if (!res.ok)
|
|
136
|
+
return null;
|
|
137
|
+
const body = (await res.json());
|
|
138
|
+
const names = new Set((body.result?.collections ?? []).map((c) => c.name));
|
|
139
|
+
for (const name of CODEX_COLLECTIONS) {
|
|
140
|
+
if (names.has(name))
|
|
141
|
+
return name;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
catch { /* Qdrant not running — RAG skipped */ }
|
|
145
|
+
return null;
|
|
146
|
+
}
|
|
147
|
+
async function fetchCodexContext(query, collection) {
|
|
148
|
+
// Keyword-based retrieval — no embedding model required.
|
|
149
|
+
// Scrolls a sample from Qdrant and ranks by keyword overlap.
|
|
150
|
+
try {
|
|
151
|
+
const keywords = query
|
|
152
|
+
.toLowerCase()
|
|
153
|
+
.split(/\s+/)
|
|
154
|
+
.filter((w) => w.length > 3)
|
|
155
|
+
.slice(0, 6);
|
|
156
|
+
if (!keywords.length)
|
|
157
|
+
return '';
|
|
158
|
+
const res = await fetch(`${QDRANT_BASE}/collections/${collection}/points/scroll`, {
|
|
159
|
+
method: 'POST',
|
|
160
|
+
headers: { 'Content-Type': 'application/json' },
|
|
161
|
+
body: JSON.stringify({ limit: 30, with_payload: true }),
|
|
162
|
+
signal: AbortSignal.timeout(5_000),
|
|
163
|
+
});
|
|
164
|
+
if (!res.ok)
|
|
165
|
+
return '';
|
|
166
|
+
const body = (await res.json());
|
|
167
|
+
const points = body.result?.points ?? [];
|
|
168
|
+
const scored = points.map((p) => {
|
|
169
|
+
const haystack = [
|
|
170
|
+
p.payload?.['title'],
|
|
171
|
+
p.payload?.['name'],
|
|
172
|
+
p.payload?.['machine_name'],
|
|
173
|
+
p.payload?.['text'],
|
|
174
|
+
p.payload?.['content'],
|
|
175
|
+
p.payload?.['description'],
|
|
176
|
+
]
|
|
177
|
+
.filter(Boolean)
|
|
178
|
+
.join(' ')
|
|
179
|
+
.toLowerCase();
|
|
180
|
+
const hits = keywords.filter((k) => haystack.includes(k)).length;
|
|
181
|
+
return { p, hits };
|
|
182
|
+
});
|
|
183
|
+
const top = scored
|
|
184
|
+
.filter((s) => s.hits > 0)
|
|
185
|
+
.sort((a, b) => b.hits - a.hits)
|
|
186
|
+
.slice(0, 3)
|
|
187
|
+
.map((s) => s.p);
|
|
188
|
+
if (!top.length)
|
|
189
|
+
return '';
|
|
190
|
+
const lines = ['--- Dirgha Codex Context (top matches) ---'];
|
|
191
|
+
for (const hit of top) {
|
|
192
|
+
const title = hit.payload?.['title'] ||
|
|
193
|
+
hit.payload?.['name'] ||
|
|
194
|
+
hit.payload?.['machine_name'] ||
|
|
195
|
+
String(hit.id);
|
|
196
|
+
const text = hit.payload?.['text'] ||
|
|
197
|
+
hit.payload?.['content'] ||
|
|
198
|
+
hit.payload?.['description'] ||
|
|
199
|
+
'';
|
|
200
|
+
lines.push(`\n[Codex: ${title}]`);
|
|
201
|
+
if (text)
|
|
202
|
+
lines.push(text.slice(0, 600));
|
|
203
|
+
}
|
|
204
|
+
lines.push('--- End Codex Context ---');
|
|
205
|
+
return lines.join('\n');
|
|
206
|
+
}
|
|
207
|
+
catch {
|
|
208
|
+
return '';
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
// ── llama-cli streaming subprocess ────────────────────────────────────
|
|
212
|
+
// Tokens that llama-cli may emit at end-of-generation — strip from output.
|
|
213
|
+
const END_TOKENS = [IM_END, EOT, '<|im_start|>'];
|
|
214
|
+
async function* streamLlamaCli(llamaPath, ggufPath, prompt, signal, timeoutMs) {
|
|
215
|
+
const args = [
|
|
216
|
+
'-m', ggufPath,
|
|
217
|
+
'-p', prompt,
|
|
218
|
+
'--no-display-prompt',
|
|
219
|
+
'--log-disable',
|
|
220
|
+
'-n', '768',
|
|
221
|
+
'--temp', '0.15',
|
|
222
|
+
'--top-p', '0.9',
|
|
223
|
+
'--repeat-penalty', '1.1',
|
|
224
|
+
'-c', '4096',
|
|
225
|
+
];
|
|
226
|
+
let proc;
|
|
227
|
+
try {
|
|
228
|
+
proc = spawn(llamaPath, args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
229
|
+
}
|
|
230
|
+
catch (err) {
|
|
231
|
+
throw new ProviderError(`Failed to start llama-cli: ${err instanceof Error ? err.message : String(err)}`, 'machine1', 0, false);
|
|
232
|
+
}
|
|
233
|
+
// Collect stderr silently for error reporting
|
|
234
|
+
const stderrChunks = [];
|
|
235
|
+
proc.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
|
|
236
|
+
// Handle spawn errors (binary not on PATH, permission denied, etc.)
|
|
237
|
+
// Using an object ref so TypeScript doesn't narrow the type via closure analysis.
|
|
238
|
+
const spawnErrRef = { value: null };
|
|
239
|
+
proc.on('error', (err) => { spawnErrRef.value = err; });
|
|
240
|
+
// Kill on timeout or caller abort
|
|
241
|
+
const timer = setTimeout(() => proc.kill('SIGTERM'), timeoutMs);
|
|
242
|
+
if (signal) {
|
|
243
|
+
signal.addEventListener('abort', () => proc.kill('SIGTERM'), { once: true });
|
|
244
|
+
}
|
|
245
|
+
yield { type: 'text_start' };
|
|
246
|
+
yield { type: 'text_delta', delta: '[Machine 1] ' };
|
|
247
|
+
let outputTokens = 0;
|
|
248
|
+
let outBuffer = '';
|
|
249
|
+
let done = false;
|
|
250
|
+
try {
|
|
251
|
+
for await (const raw of proc.stdout) {
|
|
252
|
+
if (spawnErrRef.value)
|
|
253
|
+
break;
|
|
254
|
+
outBuffer += raw.toString('utf8');
|
|
255
|
+
// Find the earliest end token in the buffer
|
|
256
|
+
let emitUpTo = outBuffer.length;
|
|
257
|
+
for (const tok of END_TOKENS) {
|
|
258
|
+
const idx = outBuffer.indexOf(tok);
|
|
259
|
+
if (idx !== -1 && idx < emitUpTo) {
|
|
260
|
+
emitUpTo = idx;
|
|
261
|
+
done = true;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
if (emitUpTo > 0) {
|
|
265
|
+
const text = outBuffer.slice(0, emitUpTo);
|
|
266
|
+
yield { type: 'text_delta', delta: text };
|
|
267
|
+
outputTokens += Math.ceil(text.length / 4);
|
|
268
|
+
}
|
|
269
|
+
// Retain tail to catch tokens spanning chunk boundaries (max token len ~14)
|
|
270
|
+
outBuffer = done ? '' : outBuffer.slice(Math.max(0, emitUpTo - 16));
|
|
271
|
+
if (done)
|
|
272
|
+
break;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
finally {
|
|
276
|
+
clearTimeout(timer);
|
|
277
|
+
yield { type: 'text_end' };
|
|
278
|
+
await new Promise((resolve) => {
|
|
279
|
+
if (proc.exitCode !== null) {
|
|
280
|
+
resolve();
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
proc.once('close', resolve);
|
|
284
|
+
});
|
|
285
|
+
if (outputTokens > 0) {
|
|
286
|
+
yield { type: 'usage', inputTokens: 0, outputTokens };
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
// Throw spawn error AFTER finally so it doesn't mask try-block exceptions.
|
|
290
|
+
if (spawnErrRef.value) {
|
|
291
|
+
throw new ProviderError(`llama-cli not found or not executable: ${spawnErrRef.value.message}. ` +
|
|
292
|
+
'Install llama.cpp and add llama-cli to your PATH, or set LLAMA_CLI_PATH.', 'machine1', 0, false);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
// ── Provider class ────────────────────────────────────────────────────
|
|
296
|
+
export class Machine1Provider {
|
|
297
|
+
id = 'machine1';
|
|
298
|
+
timeoutMs;
|
|
299
|
+
constructor(config) {
|
|
300
|
+
// CPU inference is slow — default 3 minutes
|
|
301
|
+
this.timeoutMs = config.timeoutMs ?? 180_000;
|
|
302
|
+
}
|
|
303
|
+
supportsTools(_modelId) {
|
|
304
|
+
return false;
|
|
305
|
+
}
|
|
306
|
+
supportsThinking(_modelId) {
|
|
307
|
+
return false;
|
|
308
|
+
}
|
|
309
|
+
stream(req) {
|
|
310
|
+
return this._stream(req);
|
|
311
|
+
}
|
|
312
|
+
async *_stream(req) {
|
|
313
|
+
// 1. Locate llama-cli binary
|
|
314
|
+
const llamaPath = findBinary(LLAMA_CLI_CANDIDATES);
|
|
315
|
+
if (!llamaPath) {
|
|
316
|
+
throw new ProviderError('llama-cli not found. Install llama.cpp (https://github.com/ggerganov/llama.cpp) ' +
|
|
317
|
+
'and ensure llama-cli is on your PATH, or set LLAMA_CLI_PATH=/path/to/llama-cli.', 'machine1', 0, false);
|
|
318
|
+
}
|
|
319
|
+
// 2. Locate the Machine 1 GGUF
|
|
320
|
+
const ggufPath = findGguf(GGUF_CANDIDATES);
|
|
321
|
+
if (!ggufPath) {
|
|
322
|
+
throw new ProviderError('Machine 1 model not found. Place machine1-q4_k_m.gguf in ~/.dirgha/ ' +
|
|
323
|
+
'or set MACHINE1_MODEL_PATH=/absolute/path/to/machine1.gguf.\n' +
|
|
324
|
+
'Download: dirgha pull machine1 (or visit dirgha.ai/models)', 'machine1', 0, false);
|
|
325
|
+
}
|
|
326
|
+
// 3. Optional: retrieve Codex context from Qdrant
|
|
327
|
+
let codexContext = '';
|
|
328
|
+
const collection = await resolveQdrantCollection();
|
|
329
|
+
if (collection) {
|
|
330
|
+
const query = lastUserText(req.messages);
|
|
331
|
+
if (query) {
|
|
332
|
+
codexContext = await fetchCodexContext(query, collection);
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
// 4. Build ChatML prompt
|
|
336
|
+
const prompt = buildChatML(req.messages, codexContext);
|
|
337
|
+
// 5. Stream via llama-cli subprocess
|
|
338
|
+
yield* streamLlamaCli(llamaPath, ggufPath, prompt, req.signal, this.timeoutMs);
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
//# sourceMappingURL=machine1.js.map
|