@oxagen/cli 0.6.0 → 0.6.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/agent/__tests__/judge.test.js +11 -6
- package/dist/agent/__tests__/judge.test.js.map +1 -1
- package/dist/agent/__tests__/loop-errors.test.js +32 -1
- package/dist/agent/__tests__/loop-errors.test.js.map +1 -1
- package/dist/agent/__tests__/loop-gating.test.d.ts +2 -0
- package/dist/agent/__tests__/loop-gating.test.d.ts.map +1 -0
- package/dist/agent/__tests__/loop-gating.test.js +94 -0
- package/dist/agent/__tests__/loop-gating.test.js.map +1 -0
- package/dist/agent/__tests__/model-router.test.js +16 -0
- package/dist/agent/__tests__/model-router.test.js.map +1 -1
- package/dist/agent/__tests__/permissions.test.d.ts +2 -0
- package/dist/agent/__tests__/permissions.test.d.ts.map +1 -0
- package/dist/agent/__tests__/permissions.test.js +206 -0
- package/dist/agent/__tests__/permissions.test.js.map +1 -0
- package/dist/agent/__tests__/pipeline-telemetry.test.d.ts +2 -0
- package/dist/agent/__tests__/pipeline-telemetry.test.d.ts.map +1 -0
- package/dist/agent/__tests__/pipeline-telemetry.test.js +158 -0
- package/dist/agent/__tests__/pipeline-telemetry.test.js.map +1 -0
- package/dist/agent/__tests__/pipeline.test.js +12 -3
- package/dist/agent/__tests__/pipeline.test.js.map +1 -1
- package/dist/agent/__tests__/rate-card.test.d.ts +2 -0
- package/dist/agent/__tests__/rate-card.test.d.ts.map +1 -0
- package/dist/agent/__tests__/rate-card.test.js +69 -0
- package/dist/agent/__tests__/rate-card.test.js.map +1 -0
- package/dist/agent/__tests__/system-prompt.test.d.ts +2 -0
- package/dist/agent/__tests__/system-prompt.test.d.ts.map +1 -0
- package/dist/agent/__tests__/system-prompt.test.js +29 -0
- package/dist/agent/__tests__/system-prompt.test.js.map +1 -0
- package/dist/agent/__tests__/trace-format-verbose.test.d.ts +2 -0
- package/dist/agent/__tests__/trace-format-verbose.test.d.ts.map +1 -0
- package/dist/agent/__tests__/trace-format-verbose.test.js +93 -0
- package/dist/agent/__tests__/trace-format-verbose.test.js.map +1 -0
- package/dist/agent/__tests__/verbose-log.test.d.ts +2 -0
- package/dist/agent/__tests__/verbose-log.test.d.ts.map +1 -0
- package/dist/agent/__tests__/verbose-log.test.js +69 -0
- package/dist/agent/__tests__/verbose-log.test.js.map +1 -0
- package/dist/agent/evaluator.d.ts.map +1 -1
- package/dist/agent/evaluator.js +8 -4
- package/dist/agent/evaluator.js.map +1 -1
- package/dist/agent/fleet/orchestrator.d.ts +5 -0
- package/dist/agent/fleet/orchestrator.d.ts.map +1 -1
- package/dist/agent/fleet/orchestrator.js +3 -0
- package/dist/agent/fleet/orchestrator.js.map +1 -1
- package/dist/agent/fleet/types.d.ts +2 -0
- package/dist/agent/fleet/types.d.ts.map +1 -1
- package/dist/agent/judge.d.ts +11 -3
- package/dist/agent/judge.d.ts.map +1 -1
- package/dist/agent/judge.js +15 -3
- package/dist/agent/judge.js.map +1 -1
- package/dist/agent/loop.d.ts +35 -0
- package/dist/agent/loop.d.ts.map +1 -1
- package/dist/agent/loop.js +147 -48
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/model-router.d.ts +5 -19
- package/dist/agent/model-router.d.ts.map +1 -1
- package/dist/agent/model-router.js +19 -42
- package/dist/agent/model-router.js.map +1 -1
- package/dist/agent/permissions.d.ts +103 -0
- package/dist/agent/permissions.d.ts.map +1 -0
- package/dist/agent/permissions.js +245 -0
- package/dist/agent/permissions.js.map +1 -0
- package/dist/agent/pipeline.d.ts +13 -3
- package/dist/agent/pipeline.d.ts.map +1 -1
- package/dist/agent/pipeline.js +66 -15
- package/dist/agent/pipeline.js.map +1 -1
- package/dist/agent/planner.d.ts +3 -0
- package/dist/agent/planner.d.ts.map +1 -1
- package/dist/agent/planner.js +14 -1
- package/dist/agent/planner.js.map +1 -1
- package/dist/agent/prompt-enhancer.d.ts +9 -0
- package/dist/agent/prompt-enhancer.d.ts.map +1 -1
- package/dist/agent/prompt-enhancer.js +23 -1
- package/dist/agent/prompt-enhancer.js.map +1 -1
- package/dist/agent/rate-card.d.ts +77 -0
- package/dist/agent/rate-card.d.ts.map +1 -0
- package/dist/agent/rate-card.js +99 -0
- package/dist/agent/rate-card.js.map +1 -0
- package/dist/agent/system-prompt.d.ts +5 -0
- package/dist/agent/system-prompt.d.ts.map +1 -1
- package/dist/agent/system-prompt.js +13 -4
- package/dist/agent/system-prompt.js.map +1 -1
- package/dist/agent/tools.d.ts +8 -4
- package/dist/agent/tools.d.ts.map +1 -1
- package/dist/agent/tools.js +35 -4
- package/dist/agent/tools.js.map +1 -1
- package/dist/agent/trace-format.d.ts +7 -0
- package/dist/agent/trace-format.d.ts.map +1 -1
- package/dist/agent/trace-format.js +114 -0
- package/dist/agent/trace-format.js.map +1 -1
- package/dist/agent/trace.d.ts +59 -0
- package/dist/agent/trace.d.ts.map +1 -1
- package/dist/agent/verbose-log.d.ts +8 -0
- package/dist/agent/verbose-log.d.ts.map +1 -0
- package/dist/agent/verbose-log.js +53 -0
- package/dist/agent/verbose-log.js.map +1 -0
- package/dist/agents/__tests__/loader.test.d.ts +2 -0
- package/dist/agents/__tests__/loader.test.d.ts.map +1 -0
- package/dist/agents/__tests__/loader.test.js +88 -0
- package/dist/agents/__tests__/loader.test.js.map +1 -0
- package/dist/agents/__tests__/tools.test.d.ts +2 -0
- package/dist/agents/__tests__/tools.test.d.ts.map +1 -0
- package/dist/agents/__tests__/tools.test.js +40 -0
- package/dist/agents/__tests__/tools.test.js.map +1 -0
- package/dist/agents/index.d.ts +12 -0
- package/dist/agents/index.d.ts.map +1 -0
- package/dist/agents/index.js +4 -0
- package/dist/agents/index.js.map +1 -0
- package/dist/agents/loader.d.ts +25 -0
- package/dist/agents/loader.d.ts.map +1 -0
- package/dist/agents/loader.js +133 -0
- package/dist/agents/loader.js.map +1 -0
- package/dist/agents/tools.d.ts +14 -0
- package/dist/agents/tools.d.ts.map +1 -0
- package/dist/agents/tools.js +21 -0
- package/dist/agents/tools.js.map +1 -0
- package/dist/agents/types.d.ts +27 -0
- package/dist/agents/types.d.ts.map +1 -0
- package/dist/agents/types.js +11 -0
- package/dist/agents/types.js.map +1 -0
- package/dist/agents/write.d.ts +10 -0
- package/dist/agents/write.d.ts.map +1 -0
- package/dist/agents/write.js +28 -0
- package/dist/agents/write.js.map +1 -0
- package/dist/commands/__tests__/agent.test.d.ts +2 -0
- package/dist/commands/__tests__/agent.test.d.ts.map +1 -0
- package/dist/commands/__tests__/agent.test.js +82 -0
- package/dist/commands/__tests__/agent.test.js.map +1 -0
- package/dist/commands/__tests__/command.test.d.ts +2 -0
- package/dist/commands/__tests__/command.test.d.ts.map +1 -0
- package/dist/commands/__tests__/command.test.js +73 -0
- package/dist/commands/__tests__/command.test.js.map +1 -0
- package/dist/commands/__tests__/cost.test.d.ts +2 -0
- package/dist/commands/__tests__/cost.test.d.ts.map +1 -0
- package/dist/commands/__tests__/cost.test.js +139 -0
- package/dist/commands/__tests__/cost.test.js.map +1 -0
- package/dist/commands/__tests__/graph.pull.test.d.ts +2 -0
- package/dist/commands/__tests__/graph.pull.test.d.ts.map +1 -0
- package/dist/commands/__tests__/graph.pull.test.js +259 -0
- package/dist/commands/__tests__/graph.pull.test.js.map +1 -0
- package/dist/commands/__tests__/mcp.test.d.ts +2 -0
- package/dist/commands/__tests__/mcp.test.d.ts.map +1 -0
- package/dist/commands/__tests__/mcp.test.js +88 -0
- package/dist/commands/__tests__/mcp.test.js.map +1 -0
- package/dist/commands/__tests__/rules.test.d.ts +2 -0
- package/dist/commands/__tests__/rules.test.d.ts.map +1 -0
- package/dist/commands/__tests__/rules.test.js +95 -0
- package/dist/commands/__tests__/rules.test.js.map +1 -0
- package/dist/commands/__tests__/settings.test.d.ts +2 -0
- package/dist/commands/__tests__/settings.test.d.ts.map +1 -0
- package/dist/commands/__tests__/settings.test.js +83 -0
- package/dist/commands/__tests__/settings.test.js.map +1 -0
- package/dist/commands/agent.d.ts +15 -0
- package/dist/commands/agent.d.ts.map +1 -0
- package/dist/commands/agent.js +58 -0
- package/dist/commands/agent.js.map +1 -0
- package/dist/commands/command.d.ts +17 -0
- package/dist/commands/command.d.ts.map +1 -0
- package/dist/commands/command.js +74 -0
- package/dist/commands/command.js.map +1 -0
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/cost.d.ts +10 -0
- package/dist/commands/cost.d.ts.map +1 -0
- package/dist/commands/cost.js +140 -0
- package/dist/commands/cost.js.map +1 -0
- package/dist/commands/graph.pull.d.ts +15 -0
- package/dist/commands/graph.pull.d.ts.map +1 -0
- package/dist/commands/graph.pull.js +137 -0
- package/dist/commands/graph.pull.js.map +1 -0
- package/dist/commands/graph.status.d.ts +10 -0
- package/dist/commands/graph.status.d.ts.map +1 -0
- package/dist/commands/graph.status.js +75 -0
- package/dist/commands/graph.status.js.map +1 -0
- package/dist/commands/mcp.d.ts +18 -0
- package/dist/commands/mcp.d.ts.map +1 -0
- package/dist/commands/mcp.js +183 -0
- package/dist/commands/mcp.js.map +1 -0
- package/dist/commands/rules.d.ts +19 -0
- package/dist/commands/rules.d.ts.map +1 -0
- package/dist/commands/rules.js +96 -0
- package/dist/commands/rules.js.map +1 -0
- package/dist/commands/settings.d.ts +10 -0
- package/dist/commands/settings.d.ts.map +1 -0
- package/dist/commands/settings.js +117 -0
- package/dist/commands/settings.js.map +1 -0
- package/dist/index.js +297 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/config.d.ts +2 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/mcp/__tests__/client.test.d.ts +2 -0
- package/dist/mcp/__tests__/client.test.d.ts.map +1 -0
- package/dist/mcp/__tests__/client.test.js +101 -0
- package/dist/mcp/__tests__/client.test.js.map +1 -0
- package/dist/mcp/client.d.ts +89 -0
- package/dist/mcp/client.d.ts.map +1 -0
- package/dist/mcp/client.js +201 -0
- package/dist/mcp/client.js.map +1 -0
- package/dist/repl/__tests__/components.test.js +50 -1
- package/dist/repl/__tests__/components.test.js.map +1 -1
- package/dist/repl/components.d.ts +18 -1
- package/dist/repl/components.d.ts.map +1 -1
- package/dist/repl/components.js +32 -2
- package/dist/repl/components.js.map +1 -1
- package/dist/repl/interactive.d.ts +5 -0
- package/dist/repl/interactive.d.ts.map +1 -1
- package/dist/repl/interactive.js +124 -11
- package/dist/repl/interactive.js.map +1 -1
- package/dist/repl/one-shot.d.ts +16 -0
- package/dist/repl/one-shot.d.ts.map +1 -1
- package/dist/repl/one-shot.js +71 -1
- package/dist/repl/one-shot.js.map +1 -1
- package/dist/rules/__tests__/enforce.test.d.ts +2 -0
- package/dist/rules/__tests__/enforce.test.d.ts.map +1 -0
- package/dist/rules/__tests__/enforce.test.js +58 -0
- package/dist/rules/__tests__/enforce.test.js.map +1 -0
- package/dist/rules/__tests__/loader.test.d.ts +2 -0
- package/dist/rules/__tests__/loader.test.d.ts.map +1 -0
- package/dist/rules/__tests__/loader.test.js +54 -0
- package/dist/rules/__tests__/loader.test.js.map +1 -0
- package/dist/rules/enforce.d.ts +23 -0
- package/dist/rules/enforce.d.ts.map +1 -0
- package/dist/rules/enforce.js +36 -0
- package/dist/rules/enforce.js.map +1 -0
- package/dist/rules/index.d.ts +10 -0
- package/dist/rules/index.d.ts.map +1 -0
- package/dist/rules/index.js +4 -0
- package/dist/rules/index.js.map +1 -0
- package/dist/rules/loader.d.ts +10 -0
- package/dist/rules/loader.d.ts.map +1 -0
- package/dist/rules/loader.js +77 -0
- package/dist/rules/loader.js.map +1 -0
- package/dist/rules/types.d.ts +39 -0
- package/dist/rules/types.d.ts.map +1 -0
- package/dist/rules/types.js +16 -0
- package/dist/rules/types.js.map +1 -0
- package/dist/rules/write.d.ts +10 -0
- package/dist/rules/write.d.ts.map +1 -0
- package/dist/rules/write.js +28 -0
- package/dist/rules/write.js.map +1 -0
- package/dist/settings/__tests__/gate.test.d.ts +2 -0
- package/dist/settings/__tests__/gate.test.d.ts.map +1 -0
- package/dist/settings/__tests__/gate.test.js +137 -0
- package/dist/settings/__tests__/gate.test.js.map +1 -0
- package/dist/settings/__tests__/hooks.test.d.ts +2 -0
- package/dist/settings/__tests__/hooks.test.d.ts.map +1 -0
- package/dist/settings/__tests__/hooks.test.js +103 -0
- package/dist/settings/__tests__/hooks.test.js.map +1 -0
- package/dist/settings/__tests__/mcp-write.test.d.ts +2 -0
- package/dist/settings/__tests__/mcp-write.test.d.ts.map +1 -0
- package/dist/settings/__tests__/mcp-write.test.js +77 -0
- package/dist/settings/__tests__/mcp-write.test.js.map +1 -0
- package/dist/settings/__tests__/permissions-gate.test.d.ts +2 -0
- package/dist/settings/__tests__/permissions-gate.test.d.ts.map +1 -0
- package/dist/settings/__tests__/permissions-gate.test.js +75 -0
- package/dist/settings/__tests__/permissions-gate.test.js.map +1 -0
- package/dist/settings/__tests__/resolve.test.d.ts +2 -0
- package/dist/settings/__tests__/resolve.test.d.ts.map +1 -0
- package/dist/settings/__tests__/resolve.test.js +109 -0
- package/dist/settings/__tests__/resolve.test.js.map +1 -0
- package/dist/settings/__tests__/runtime.test.d.ts +2 -0
- package/dist/settings/__tests__/runtime.test.d.ts.map +1 -0
- package/dist/settings/__tests__/runtime.test.js +72 -0
- package/dist/settings/__tests__/runtime.test.js.map +1 -0
- package/dist/settings/__tests__/schema.test.d.ts +2 -0
- package/dist/settings/__tests__/schema.test.d.ts.map +1 -0
- package/dist/settings/__tests__/schema.test.js +55 -0
- package/dist/settings/__tests__/schema.test.js.map +1 -0
- package/dist/settings/__tests__/write.test.d.ts +2 -0
- package/dist/settings/__tests__/write.test.d.ts.map +1 -0
- package/dist/settings/__tests__/write.test.js +61 -0
- package/dist/settings/__tests__/write.test.js.map +1 -0
- package/dist/settings/gate.d.ts +34 -0
- package/dist/settings/gate.d.ts.map +1 -0
- package/dist/settings/gate.js +50 -0
- package/dist/settings/gate.js.map +1 -0
- package/dist/settings/hooks.d.ts +26 -0
- package/dist/settings/hooks.d.ts.map +1 -0
- package/dist/settings/hooks.js +115 -0
- package/dist/settings/hooks.js.map +1 -0
- package/dist/settings/index.d.ts +23 -0
- package/dist/settings/index.d.ts.map +1 -0
- package/dist/settings/index.js +23 -0
- package/dist/settings/index.js.map +1 -0
- package/dist/settings/mcp-write.d.ts +41 -0
- package/dist/settings/mcp-write.d.ts.map +1 -0
- package/dist/settings/mcp-write.js +61 -0
- package/dist/settings/mcp-write.js.map +1 -0
- package/dist/settings/permissions-gate.d.ts +19 -0
- package/dist/settings/permissions-gate.d.ts.map +1 -0
- package/dist/settings/permissions-gate.js +103 -0
- package/dist/settings/permissions-gate.js.map +1 -0
- package/dist/settings/resolve.d.ts +37 -0
- package/dist/settings/resolve.d.ts.map +1 -0
- package/dist/settings/resolve.js +169 -0
- package/dist/settings/resolve.js.map +1 -0
- package/dist/settings/runtime.d.ts +28 -0
- package/dist/settings/runtime.d.ts.map +1 -0
- package/dist/settings/runtime.js +45 -0
- package/dist/settings/runtime.js.map +1 -0
- package/dist/settings/schema.d.ts +1387 -0
- package/dist/settings/schema.d.ts.map +1 -0
- package/dist/settings/schema.js +146 -0
- package/dist/settings/schema.js.map +1 -0
- package/dist/settings/write.d.ts +37 -0
- package/dist/settings/write.d.ts.map +1 -0
- package/dist/settings/write.js +85 -0
- package/dist/settings/write.js.map +1 -0
- package/dist/slash/__tests__/expand.test.d.ts +2 -0
- package/dist/slash/__tests__/expand.test.d.ts.map +1 -0
- package/dist/slash/__tests__/expand.test.js +44 -0
- package/dist/slash/__tests__/expand.test.js.map +1 -0
- package/dist/slash/__tests__/loader.test.d.ts +2 -0
- package/dist/slash/__tests__/loader.test.d.ts.map +1 -0
- package/dist/slash/__tests__/loader.test.js +48 -0
- package/dist/slash/__tests__/loader.test.js.map +1 -0
- package/dist/slash/expand.d.ts +32 -0
- package/dist/slash/expand.d.ts.map +1 -0
- package/dist/slash/expand.js +48 -0
- package/dist/slash/expand.js.map +1 -0
- package/dist/slash/index.d.ts +11 -0
- package/dist/slash/index.d.ts.map +1 -0
- package/dist/slash/index.js +4 -0
- package/dist/slash/index.js.map +1 -0
- package/dist/slash/loader.d.ts +10 -0
- package/dist/slash/loader.d.ts.map +1 -0
- package/dist/slash/loader.js +64 -0
- package/dist/slash/loader.js.map +1 -0
- package/dist/slash/types.d.ts +24 -0
- package/dist/slash/types.d.ts.map +1 -0
- package/dist/slash/types.js +11 -0
- package/dist/slash/types.js.map +1 -0
- package/dist/slash/write.d.ts +10 -0
- package/dist/slash/write.d.ts.map +1 -0
- package/dist/slash/write.js +26 -0
- package/dist/slash/write.js.map +1 -0
- package/dist/tui/fleet-view/index.d.ts.map +1 -1
- package/dist/tui/fleet-view/index.js +5 -1
- package/dist/tui/fleet-view/index.js.map +1 -1
- package/package.json +5 -1
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `oxagen cost` — make cost projection trivial.
|
|
3
|
+
*
|
|
4
|
+
* The rate card is baked into the CLI, so you never need a spreadsheet to answer
|
|
5
|
+
* "what would this run cost on model X?" or "which model is cheapest for this
|
|
6
|
+
* workload?". Modes:
|
|
7
|
+
*
|
|
8
|
+
* oxagen cost --in 200000 --out 40000 project on every model, cheapest first
|
|
9
|
+
* oxagen cost --in 200000 --out 40000 --model … project on one model
|
|
10
|
+
* oxagen cost --rates print the baked-in rate card
|
|
11
|
+
* oxagen cost --session roll up what THIS project's turns
|
|
12
|
+
* actually cost, by model (proof)
|
|
13
|
+
*
|
|
14
|
+
* Add --json to any mode for machine-readable output.
|
|
15
|
+
*/
|
|
16
|
+
import { RATE_CARD, compareModels, formatUsd, projectCost, } from "../agent/rate-card.js";
|
|
17
|
+
import { openTraceStore } from "../agent/trace-store.js";
|
|
18
|
+
const out = (s) => void process.stdout.write(s + "\n");
|
|
19
|
+
export async function handleCost(opts) {
|
|
20
|
+
if (opts.rates)
|
|
21
|
+
return printRates(opts.json ?? false);
|
|
22
|
+
if (opts.session)
|
|
23
|
+
return printSession(process.cwd(), opts.json ?? false);
|
|
24
|
+
return printProjection(opts);
|
|
25
|
+
}
|
|
26
|
+
/** Dump the baked-in rate card (USD per 1M tokens). */
|
|
27
|
+
function printRates(json) {
|
|
28
|
+
if (json) {
|
|
29
|
+
out(JSON.stringify(RATE_CARD, null, 2));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
out("Rate card (USD per 1,000,000 tokens):");
|
|
33
|
+
out("");
|
|
34
|
+
out(` ${"model".padEnd(16)}${"vendor".padEnd(12)}${"input".padStart(10)}${"output".padStart(10)}`);
|
|
35
|
+
for (const e of RATE_CARD) {
|
|
36
|
+
out(` ${e.label.padEnd(16)}${e.vendor.padEnd(12)}` +
|
|
37
|
+
`${("$" + e.rate.inputPer1M).padStart(10)}${("$" + e.rate.outputPer1M).padStart(10)}`);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/** Project a token usage across one model or every model (cheapest first). */
|
|
41
|
+
function printProjection(opts) {
|
|
42
|
+
const inputTokens = opts.in ?? 0;
|
|
43
|
+
const outputTokens = opts.out ?? 0;
|
|
44
|
+
if (inputTokens === 0 && outputTokens === 0) {
|
|
45
|
+
out("Provide token counts: oxagen cost --in <input> --out <output> [--model <slug>]");
|
|
46
|
+
out("Or: oxagen cost --rates | oxagen cost --session");
|
|
47
|
+
process.exitCode = 1;
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const usage = { inputTokens, outputTokens };
|
|
51
|
+
const rows = opts.model ? [projectCost(opts.model, usage)] : compareModels(usage);
|
|
52
|
+
if (opts.json) {
|
|
53
|
+
out(JSON.stringify(opts.model ? rows[0] : rows, null, 2));
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
out(`Projected cost for ${inputTokens.toLocaleString()} in → ${outputTokens.toLocaleString()} out tokens:`);
|
|
57
|
+
out("");
|
|
58
|
+
out(` ${"model".padEnd(18)}${"input".padStart(12)}${"output".padStart(12)}${"total".padStart(12)}`);
|
|
59
|
+
for (const r of rows) {
|
|
60
|
+
out(` ${(r.label + (r.fallback ? " *" : "")).padEnd(18)}` +
|
|
61
|
+
`${formatUsd(r.inputCostUsd).padStart(12)}${formatUsd(r.outputCostUsd).padStart(12)}` +
|
|
62
|
+
`${formatUsd(r.totalUsd).padStart(12)}`);
|
|
63
|
+
}
|
|
64
|
+
if (!opts.model && rows.length > 1) {
|
|
65
|
+
const cheap = rows[0];
|
|
66
|
+
const dear = rows[rows.length - 1];
|
|
67
|
+
const factor = cheap.totalUsd > 0 ? (dear.totalUsd / cheap.totalUsd).toFixed(1) : "∞";
|
|
68
|
+
out("");
|
|
69
|
+
out(` cheapest: ${cheap.label} (${formatUsd(cheap.totalUsd)}) — ${factor}× cheaper than ${dear.label}.`);
|
|
70
|
+
}
|
|
71
|
+
if (rows.some((r) => r.fallback))
|
|
72
|
+
out("\n * no exact rate-card entry; priced at the fallback rate.");
|
|
73
|
+
}
|
|
74
|
+
/** Attribute a trace's spend to models — per-phase when available, else the executor. */
|
|
75
|
+
function attribute(trace, byModel) {
|
|
76
|
+
const add = (model, inTok, outTok, cost, ms) => {
|
|
77
|
+
const m = byModel.get(model) ??
|
|
78
|
+
{ model, inputTokens: 0, outputTokens: 0, costUsd: 0, durationMs: 0, turns: 0 };
|
|
79
|
+
m.inputTokens += inTok;
|
|
80
|
+
m.outputTokens += outTok;
|
|
81
|
+
m.costUsd += cost;
|
|
82
|
+
m.durationMs += ms;
|
|
83
|
+
byModel.set(model, m);
|
|
84
|
+
};
|
|
85
|
+
if (trace.phases?.length) {
|
|
86
|
+
for (const p of trace.phases) {
|
|
87
|
+
if (!p.model)
|
|
88
|
+
continue;
|
|
89
|
+
add(p.model, p.usage.inputTokens, p.usage.outputTokens, p.usage.costUsd, p.durationMs);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
add(trace.selectedModel, trace.usage.inputTokens, trace.usage.outputTokens, trace.usage.costUsd, trace.durationMs);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
/** Roll up what this project's recorded turns actually cost, by model. */
|
|
97
|
+
function printSession(cwd, json) {
|
|
98
|
+
const traces = openTraceStore(cwd).list();
|
|
99
|
+
const byModel = new Map();
|
|
100
|
+
let totalCost = 0;
|
|
101
|
+
let totalMs = 0;
|
|
102
|
+
let totalIn = 0;
|
|
103
|
+
let totalOut = 0;
|
|
104
|
+
for (const t of traces) {
|
|
105
|
+
attribute(t, byModel);
|
|
106
|
+
totalCost += t.usage.costUsd;
|
|
107
|
+
totalMs += t.durationMs;
|
|
108
|
+
totalIn += t.usage.inputTokens;
|
|
109
|
+
totalOut += t.usage.outputTokens;
|
|
110
|
+
}
|
|
111
|
+
// Count turns per model (by executor, the model that did the work).
|
|
112
|
+
for (const t of traces) {
|
|
113
|
+
const m = byModel.get(t.selectedModel);
|
|
114
|
+
if (m)
|
|
115
|
+
m.turns += 1;
|
|
116
|
+
}
|
|
117
|
+
const spend = [...byModel.values()].sort((a, b) => b.costUsd - a.costUsd);
|
|
118
|
+
if (json) {
|
|
119
|
+
out(JSON.stringify({ turns: traces.length, totalCostUsd: totalCost, totalDurationMs: totalMs, totalInputTokens: totalIn, totalOutputTokens: totalOut, byModel: spend }, null, 2));
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if (traces.length === 0) {
|
|
123
|
+
out("No turns recorded for this project yet. Run some prompts, then re-check.");
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
out(`Session cost rollup — ${traces.length} turn(s) in ${cwd.split("/").pop()}:`);
|
|
127
|
+
out("");
|
|
128
|
+
out(` ${"model".padEnd(20)}${"turns".padStart(7)}${"tokens".padStart(16)}${"cost".padStart(12)}${"time".padStart(10)}`);
|
|
129
|
+
for (const m of spend) {
|
|
130
|
+
const tok = `${m.inputTokens}→${m.outputTokens}`;
|
|
131
|
+
out(` ${(m.model.split("/").pop() ?? m.model).padEnd(20)}${String(m.turns).padStart(7)}` +
|
|
132
|
+
`${tok.padStart(16)}${formatUsd(m.costUsd).padStart(12)}${(Math.round(m.durationMs / 100) / 10 + "s").padStart(10)}`);
|
|
133
|
+
}
|
|
134
|
+
out("");
|
|
135
|
+
const avgCost = traces.length ? totalCost / traces.length : 0;
|
|
136
|
+
const avgMs = traces.length ? totalMs / traces.length : 0;
|
|
137
|
+
out(` total: ${formatUsd(totalCost)} · ${totalIn + totalOut} tok · ${(totalMs / 1000).toFixed(1)}s ` +
|
|
138
|
+
`(avg ${formatUsd(avgCost)} · ${(avgMs / 1000).toFixed(1)}s per turn)`);
|
|
139
|
+
}
|
|
140
|
+
//# sourceMappingURL=cost.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cost.js","sourceRoot":"","sources":["../../src/commands/cost.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export interface GraphPullOptions {
|
|
2
|
+
full?: boolean;
|
|
3
|
+
labels?: string;
|
|
4
|
+
noSystem?: boolean;
|
|
5
|
+
json?: boolean;
|
|
6
|
+
/**
|
|
7
|
+
* @internal test seam: override the DuckDB path.
|
|
8
|
+
* Pass `":memory:"` in tests to avoid touching the filesystem.
|
|
9
|
+
*/
|
|
10
|
+
_duckdbPath?: string;
|
|
11
|
+
}
|
|
12
|
+
/** Canonical DuckDB path for a given workspace slug. */
|
|
13
|
+
export declare function graphStorePath(workspaceSlug: string): string;
|
|
14
|
+
export declare function handleGraphPull(opts: GraphPullOptions): Promise<void>;
|
|
15
|
+
//# sourceMappingURL=graph.pull.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graph.pull.d.ts","sourceRoot":"","sources":["../../src/commands/graph.pull.ts"],"names":[],"mappings":"AAyBA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoCD,wDAAwD;AACxD,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE5D;AAeD,wBAAsB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0H3E"}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `oxagen graph pull` — download an incremental snapshot of the workspace
|
|
3
|
+
* knowledge graph into a local DuckDB replica.
|
|
4
|
+
*
|
|
5
|
+
* The replica lives at `~/.config/oxagen/graph/<workspaceSlug>.duckdb`. A
|
|
6
|
+
* sync cursor (high-watermark string + counts) is persisted after every pull so
|
|
7
|
+
* subsequent runs only fetch what changed. Pass `--full` to ignore the cursor
|
|
8
|
+
* and re-pull everything.
|
|
9
|
+
*
|
|
10
|
+
* Pagination: the pull loop calls `graph/export` with `limit=500` + an
|
|
11
|
+
* incrementing `offset` until `hasMore` is false, then persists the cursor
|
|
12
|
+
* returned by the last page.
|
|
13
|
+
*/
|
|
14
|
+
import { mkdirSync } from "node:fs";
|
|
15
|
+
import { homedir } from "node:os";
|
|
16
|
+
import { dirname, join } from "node:path";
|
|
17
|
+
import { apiPost } from "../lib/api.js";
|
|
18
|
+
import { getOrgId, getWorkspaceId } from "../lib/config.js";
|
|
19
|
+
import { createGraphStore } from "@oxagen/engram";
|
|
20
|
+
// ---------------------------------------------------------------------------
|
|
21
|
+
// Helpers
|
|
22
|
+
// ---------------------------------------------------------------------------
|
|
23
|
+
const PAGE_SIZE = 500;
|
|
24
|
+
/** Canonical DuckDB path for a given workspace slug. */
|
|
25
|
+
export function graphStorePath(workspaceSlug) {
|
|
26
|
+
return join(homedir(), ".config", "oxagen", "graph", `${workspaceSlug}.duckdb`);
|
|
27
|
+
}
|
|
28
|
+
function splitCsv(value) {
|
|
29
|
+
if (!value)
|
|
30
|
+
return undefined;
|
|
31
|
+
const parts = value
|
|
32
|
+
.split(",")
|
|
33
|
+
.map((s) => s.trim())
|
|
34
|
+
.filter(Boolean);
|
|
35
|
+
return parts.length > 0 ? parts : undefined;
|
|
36
|
+
}
|
|
37
|
+
// ---------------------------------------------------------------------------
|
|
38
|
+
// Handler
|
|
39
|
+
// ---------------------------------------------------------------------------
|
|
40
|
+
export async function handleGraphPull(opts) {
|
|
41
|
+
const org = getOrgId();
|
|
42
|
+
const workspace = getWorkspaceId();
|
|
43
|
+
if (!org || !workspace) {
|
|
44
|
+
process.stderr.write("Missing org or workspace. Run `oxagen config` or set " +
|
|
45
|
+
"OXAGEN_ORG_ID / OXAGEN_WORKSPACE_ID.\n");
|
|
46
|
+
process.exitCode = 1;
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
// Resolve DuckDB path — test seam allows ":memory:" to skip filesystem ops.
|
|
50
|
+
const duckdbPath = opts._duckdbPath ?? graphStorePath(workspace);
|
|
51
|
+
if (duckdbPath !== ":memory:") {
|
|
52
|
+
mkdirSync(dirname(duckdbPath), { recursive: true });
|
|
53
|
+
}
|
|
54
|
+
const store = createGraphStore({ duckdbPath });
|
|
55
|
+
try {
|
|
56
|
+
// Determine the starting cursor (skip if --full).
|
|
57
|
+
let updatedAfter;
|
|
58
|
+
if (!opts.full) {
|
|
59
|
+
const existing = await store.getCursor(org, workspace);
|
|
60
|
+
updatedAfter = existing?.cursor;
|
|
61
|
+
}
|
|
62
|
+
const labelArray = splitCsv(opts.labels);
|
|
63
|
+
const isSystem = opts.noSystem ? false : undefined;
|
|
64
|
+
// Pull loop: paginate until hasMore=false.
|
|
65
|
+
let offset = 0;
|
|
66
|
+
let totalNodes = 0;
|
|
67
|
+
let totalEdges = 0;
|
|
68
|
+
let newCursor;
|
|
69
|
+
while (true) {
|
|
70
|
+
const page = await apiPost("graph/export", {
|
|
71
|
+
updatedAfter,
|
|
72
|
+
labels: labelArray,
|
|
73
|
+
isSystem,
|
|
74
|
+
limit: PAGE_SIZE,
|
|
75
|
+
offset,
|
|
76
|
+
});
|
|
77
|
+
// Enrich remote nodes/edges with local org+workspace keys.
|
|
78
|
+
const nodes = page.nodes.map((n) => ({
|
|
79
|
+
id: n.id,
|
|
80
|
+
labels: n.labels,
|
|
81
|
+
displayName: n.displayName,
|
|
82
|
+
properties: n.properties,
|
|
83
|
+
sourceId: n.sourceId,
|
|
84
|
+
isSystem: n.isSystem ?? false,
|
|
85
|
+
updatedAt: n.updatedAt ?? new Date().toISOString(),
|
|
86
|
+
org,
|
|
87
|
+
workspace,
|
|
88
|
+
}));
|
|
89
|
+
const edges = page.edges.map((e) => ({
|
|
90
|
+
id: e.id,
|
|
91
|
+
sourceId: e.sourceId,
|
|
92
|
+
targetId: e.targetId,
|
|
93
|
+
type: e.type,
|
|
94
|
+
properties: e.properties,
|
|
95
|
+
inferred: e.inferred ?? false,
|
|
96
|
+
org,
|
|
97
|
+
workspace,
|
|
98
|
+
}));
|
|
99
|
+
await store.upsertNodes(nodes);
|
|
100
|
+
await store.upsertEdges(edges);
|
|
101
|
+
totalNodes += nodes.length;
|
|
102
|
+
totalEdges += edges.length;
|
|
103
|
+
if (page.cursor)
|
|
104
|
+
newCursor = page.cursor;
|
|
105
|
+
process.stderr.write(` Pulled ${totalNodes} nodes, ${totalEdges} edges (offset=${offset})...\r`);
|
|
106
|
+
if (!page.hasMore)
|
|
107
|
+
break;
|
|
108
|
+
offset += PAGE_SIZE;
|
|
109
|
+
}
|
|
110
|
+
// Clear the progress line.
|
|
111
|
+
process.stderr.write("\n");
|
|
112
|
+
// Persist the cursor after a successful pull.
|
|
113
|
+
const finalStats = await store.stats(org, workspace);
|
|
114
|
+
const cursorToStore = newCursor ?? new Date().toISOString();
|
|
115
|
+
await store.setCursor(org, workspace, cursorToStore, finalStats.nodeCount, finalStats.edgeCount);
|
|
116
|
+
// Report summary.
|
|
117
|
+
const summary = {
|
|
118
|
+
pulled: { nodes: totalNodes, edges: totalEdges },
|
|
119
|
+
total: { nodes: finalStats.nodeCount, edges: finalStats.edgeCount },
|
|
120
|
+
cursor: cursorToStore,
|
|
121
|
+
path: duckdbPath,
|
|
122
|
+
};
|
|
123
|
+
if (opts.json) {
|
|
124
|
+
process.stdout.write(JSON.stringify(summary, null, 2) + "\n");
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
process.stdout.write(`Pulled ${totalNodes} node(s) and ${totalEdges} edge(s) this run.\n` +
|
|
128
|
+
`Total in local store: ${finalStats.nodeCount} nodes, ${finalStats.edgeCount} edges.\n` +
|
|
129
|
+
`Cursor: ${cursorToStore}\n` +
|
|
130
|
+
`Path: ${duckdbPath}\n`);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
finally {
|
|
134
|
+
await store.close();
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
//# sourceMappingURL=graph.pull.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graph.pull.js","sourceRoot":"","sources":["../../src/commands/graph.pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface GraphStatusOptions {
|
|
2
|
+
json?: boolean;
|
|
3
|
+
/**
|
|
4
|
+
* @internal test seam: override the DuckDB path.
|
|
5
|
+
* Pass `":memory:"` in tests.
|
|
6
|
+
*/
|
|
7
|
+
_duckdbPath?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function handleGraphStatus(opts: GraphStatusOptions): Promise<void>;
|
|
10
|
+
//# sourceMappingURL=graph.status.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graph.status.d.ts","sourceRoot":"","sources":["../../src/commands/graph.status.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAMD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,IAAI,CAAC,CAuEf"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `oxagen graph status` — show the state of the local workspace-graph replica.
|
|
3
|
+
*
|
|
4
|
+
* Reports node/edge counts, the current sync cursor (high-watermark), when it
|
|
5
|
+
* was last synced, and the local DuckDB path. If no pull has been run yet,
|
|
6
|
+
* says so clearly.
|
|
7
|
+
*/
|
|
8
|
+
import { existsSync } from "node:fs";
|
|
9
|
+
import { getOrgId, getWorkspaceId } from "../lib/config.js";
|
|
10
|
+
import { createGraphStore } from "@oxagen/engram";
|
|
11
|
+
import { graphStorePath } from "./graph.pull.js";
|
|
12
|
+
// ---------------------------------------------------------------------------
|
|
13
|
+
// Handler
|
|
14
|
+
// ---------------------------------------------------------------------------
|
|
15
|
+
export async function handleGraphStatus(opts) {
|
|
16
|
+
const org = getOrgId();
|
|
17
|
+
const workspace = getWorkspaceId();
|
|
18
|
+
if (!org || !workspace) {
|
|
19
|
+
process.stderr.write("Missing org or workspace. Run `oxagen config` or set " +
|
|
20
|
+
"OXAGEN_ORG_ID / OXAGEN_WORKSPACE_ID.\n");
|
|
21
|
+
process.exitCode = 1;
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const duckdbPath = opts._duckdbPath ?? graphStorePath(workspace);
|
|
25
|
+
const pathIsMemory = duckdbPath === ":memory:";
|
|
26
|
+
// If the file hasn't been created yet, tell the user to run pull first.
|
|
27
|
+
if (!pathIsMemory && !existsSync(duckdbPath)) {
|
|
28
|
+
if (opts.json) {
|
|
29
|
+
process.stdout.write(JSON.stringify({
|
|
30
|
+
pulled: false,
|
|
31
|
+
path: duckdbPath,
|
|
32
|
+
org,
|
|
33
|
+
workspace,
|
|
34
|
+
}) + "\n");
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
process.stdout.write(`No local graph copy found.\n` +
|
|
38
|
+
`Run \`oxagen graph pull\` to download the workspace graph.\n` +
|
|
39
|
+
`Expected path: ${duckdbPath}\n`);
|
|
40
|
+
}
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const store = createGraphStore({ duckdbPath });
|
|
44
|
+
try {
|
|
45
|
+
const stats = await store.stats(org, workspace);
|
|
46
|
+
if (opts.json) {
|
|
47
|
+
process.stdout.write(JSON.stringify({
|
|
48
|
+
pulled: true,
|
|
49
|
+
nodeCount: stats.nodeCount,
|
|
50
|
+
edgeCount: stats.edgeCount,
|
|
51
|
+
cursor: stats.cursor,
|
|
52
|
+
syncedAt: stats.syncedAt,
|
|
53
|
+
path: duckdbPath,
|
|
54
|
+
org,
|
|
55
|
+
workspace,
|
|
56
|
+
}) + "\n");
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const syncedAtStr = stats.syncedAt
|
|
60
|
+
? new Date(stats.syncedAt).toISOString()
|
|
61
|
+
: "(never)";
|
|
62
|
+
process.stdout.write(`Nodes: ${stats.nodeCount}\n` +
|
|
63
|
+
`Edges: ${stats.edgeCount}\n` +
|
|
64
|
+
`Cursor: ${stats.cursor ?? "(none)"}\n` +
|
|
65
|
+
`Last synced: ${syncedAtStr}\n` +
|
|
66
|
+
`Org: ${org}\n` +
|
|
67
|
+
`Workspace: ${workspace}\n` +
|
|
68
|
+
`Path: ${duckdbPath}\n`);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
finally {
|
|
72
|
+
await store.close();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=graph.status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graph.status.js","sourceRoot":"","sources":["../../src/commands/graph.status.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAejD,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAwB;IAExB,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,cAAc,EAAE,CAAC;IAEnC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,uDAAuD;YACrD,wCAAwC,CAC3C,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,UAAU,KAAK,UAAU,CAAC;IAE/C,wEAAwE;IACxE,IAAI,CAAC,YAAY,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,IAAI,CAAC,SAAS,CAAC;gBACb,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,UAAU;gBAChB,GAAG;gBACH,SAAS;aACV,CAAC,GAAG,IAAI,CACV,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,8BAA8B;gBAC5B,8DAA8D;gBAC9D,kBAAkB,UAAU,IAAI,CACnC,CAAC;QACJ,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEhD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,IAAI,CAAC,SAAS,CAAC;gBACb,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,IAAI,EAAE,UAAU;gBAChB,GAAG;gBACH,SAAS;aACV,CAAC,GAAG,IAAI,CACV,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ;gBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE;gBACxC,CAAC,CAAC,SAAS,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gBAAgB,KAAK,CAAC,SAAS,IAAI;gBACjC,gBAAgB,KAAK,CAAC,SAAS,IAAI;gBACnC,gBAAgB,KAAK,CAAC,MAAM,IAAI,QAAQ,IAAI;gBAC5C,gBAAgB,WAAW,IAAI;gBAC/B,gBAAgB,GAAG,IAAI;gBACvB,gBAAgB,SAAS,IAAI;gBAC7B,gBAAgB,UAAU,IAAI,CACjC,CAAC;QACJ,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { type ResolveSettingsOptions } from "../settings/index.js";
|
|
2
|
+
export type McpCtx = Pick<ResolveSettingsOptions, "cwd" | "userSettingsPath" | "projectDirName">;
|
|
3
|
+
export interface McpAddOptions {
|
|
4
|
+
command?: string;
|
|
5
|
+
arg?: string[];
|
|
6
|
+
url?: string;
|
|
7
|
+
transport?: string;
|
|
8
|
+
auth?: string;
|
|
9
|
+
envToken?: string;
|
|
10
|
+
header?: string[];
|
|
11
|
+
scope?: string;
|
|
12
|
+
}
|
|
13
|
+
export declare function mcpAdd(name: string, opts: McpAddOptions, ctx?: McpCtx): void;
|
|
14
|
+
export declare function mcpList(ctx?: McpCtx): void;
|
|
15
|
+
export declare function mcpRemove(name: string, scopeArg: string | undefined, ctx?: McpCtx): void;
|
|
16
|
+
export declare function mcpSetEnabled(name: string, enabled: boolean, scopeArg: string | undefined, ctx?: McpCtx): void;
|
|
17
|
+
export declare function mcpCheck(name: string | undefined, ctx?: McpCtx): Promise<void>;
|
|
18
|
+
//# sourceMappingURL=mcp.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"AAeA,OAAO,EAML,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAG9B,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,EAAE,KAAK,GAAG,kBAAkB,GAAG,gBAAgB,CAAC,CAAC;AASjG,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAqCD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,GAAE,MAAW,GAAG,IAAI,CAoBhF;AAmBD,wBAAgB,OAAO,CAAC,GAAG,GAAE,MAAW,GAAG,IAAI,CAgB9C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,GAAE,MAAW,GAAG,IAAI,CAY5F;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,GAAG,GAAE,MAAW,GACf,IAAI,CAiBN;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCxF"}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* mcp command — manage external MCP servers in settings.json.
|
|
3
|
+
*
|
|
4
|
+
* oxagen mcp add <name> --command "npx -y server" Add a stdio server
|
|
5
|
+
* oxagen mcp add <name> --url <url> [--auth bearer --env-token GH_TOKEN]
|
|
6
|
+
* oxagen mcp list List configured servers
|
|
7
|
+
* oxagen mcp remove <name> Remove a server
|
|
8
|
+
* oxagen mcp enable|disable <name> Toggle a server
|
|
9
|
+
* oxagen mcp check [name] Connect + preview tools
|
|
10
|
+
*
|
|
11
|
+
* Servers are written to a scope file (default project) and resolved by the
|
|
12
|
+
* agent loop, which materializes their tools through the same visibility +
|
|
13
|
+
* permission rules shown by `check`.
|
|
14
|
+
*/
|
|
15
|
+
import { mcpServerSchema } from "@oxagen/mcp-config/schema";
|
|
16
|
+
import { loadSettings, writeMcpServer, removeMcpServer, setMcpServerDisabled, } from "../settings/index.js";
|
|
17
|
+
import { checkServer } from "../mcp/client.js";
|
|
18
|
+
const SCOPES = ["user", "project", "local"];
|
|
19
|
+
const HTTP_TRANSPORTS = ["streamable-http", "sse", "websocket"];
|
|
20
|
+
function isScope(value) {
|
|
21
|
+
return SCOPES.includes(value);
|
|
22
|
+
}
|
|
23
|
+
function parseHeaders(pairs) {
|
|
24
|
+
if (!pairs || pairs.length === 0)
|
|
25
|
+
return undefined;
|
|
26
|
+
const out = {};
|
|
27
|
+
for (const pair of pairs) {
|
|
28
|
+
const eq = pair.indexOf("=");
|
|
29
|
+
if (eq === -1)
|
|
30
|
+
throw new Error(`--header must be KEY=VALUE (got "${pair}")`);
|
|
31
|
+
out[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
|
|
32
|
+
}
|
|
33
|
+
return out;
|
|
34
|
+
}
|
|
35
|
+
function buildConfig(opts) {
|
|
36
|
+
if (opts.command) {
|
|
37
|
+
return mcpServerSchema.parse({
|
|
38
|
+
transport: "stdio",
|
|
39
|
+
command: opts.command,
|
|
40
|
+
args: opts.arg ?? [],
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
if (!opts.url) {
|
|
44
|
+
throw new Error("provide either --command (stdio) or --url (http/sse/websocket)");
|
|
45
|
+
}
|
|
46
|
+
const transport = opts.transport ?? "streamable-http";
|
|
47
|
+
if (!HTTP_TRANSPORTS.includes(transport)) {
|
|
48
|
+
throw new Error(`--transport must be one of: ${HTTP_TRANSPORTS.join(", ")}`);
|
|
49
|
+
}
|
|
50
|
+
return mcpServerSchema.parse({
|
|
51
|
+
transport,
|
|
52
|
+
url: opts.url,
|
|
53
|
+
auth: opts.auth ?? "none",
|
|
54
|
+
envToken: opts.envToken,
|
|
55
|
+
headers: parseHeaders(opts.header),
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
export function mcpAdd(name, opts, ctx = {}) {
|
|
59
|
+
const scope = opts.scope ?? "project";
|
|
60
|
+
if (!isScope(scope)) {
|
|
61
|
+
console.error(`Unknown scope "${scope}". Use one of: ${SCOPES.join(", ")}`);
|
|
62
|
+
process.exitCode = 1;
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
let config;
|
|
66
|
+
try {
|
|
67
|
+
config = buildConfig(opts);
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
|
|
71
|
+
process.exitCode = 1;
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const path = writeMcpServer({ ...ctx, scope, name, config });
|
|
75
|
+
console.log(`✓ Added MCP server "${name}" (${config.transport}) to ${scope}: ${path}`);
|
|
76
|
+
if ("envToken" in config && config.envToken) {
|
|
77
|
+
console.log(` Set the token in your environment: export ${config.envToken}=…`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
/** Highest-precedence scope that defines each server (for display). */
|
|
81
|
+
function sourceMap(ctx) {
|
|
82
|
+
const { scopes } = loadSettings({ ...ctx, noCache: true });
|
|
83
|
+
const map = {};
|
|
84
|
+
for (const sc of scopes) {
|
|
85
|
+
for (const serverName of Object.keys(sc.settings?.mcpServers ?? {})) {
|
|
86
|
+
map[serverName] = sc.scope; // later scope (higher precedence) wins
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return map;
|
|
90
|
+
}
|
|
91
|
+
function target(config) {
|
|
92
|
+
if (config.transport === "stdio")
|
|
93
|
+
return [config.command, ...config.args].join(" ");
|
|
94
|
+
return config.url;
|
|
95
|
+
}
|
|
96
|
+
export function mcpList(ctx = {}) {
|
|
97
|
+
const { settings } = loadSettings({ ...ctx, noCache: true });
|
|
98
|
+
const servers = settings.mcpServers ?? {};
|
|
99
|
+
const names = Object.keys(servers);
|
|
100
|
+
if (names.length === 0) {
|
|
101
|
+
console.log("No MCP servers configured. Add one with `oxagen mcp add`.");
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const source = sourceMap(ctx);
|
|
105
|
+
console.log("MCP servers:\n");
|
|
106
|
+
for (const name of names) {
|
|
107
|
+
const config = servers[name];
|
|
108
|
+
const disabled = "disabled" in config && config.disabled ? " [disabled]" : "";
|
|
109
|
+
console.log(` ${name}${disabled}`);
|
|
110
|
+
console.log(` ${config.transport} ${target(config)} (${source[name] ?? "?"})`);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
export function mcpRemove(name, scopeArg, ctx = {}) {
|
|
114
|
+
if (scopeArg && !isScope(scopeArg)) {
|
|
115
|
+
console.error(`Unknown scope "${scopeArg}". Use one of: ${SCOPES.join(", ")}`);
|
|
116
|
+
process.exitCode = 1;
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
const { found, path } = removeMcpServer({ ...ctx, name, scope: scopeArg });
|
|
120
|
+
if (found)
|
|
121
|
+
console.log(`✓ Removed MCP server "${name}" from ${path}`);
|
|
122
|
+
else {
|
|
123
|
+
console.error(`MCP server "${name}" not found.`);
|
|
124
|
+
process.exitCode = 1;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
export function mcpSetEnabled(name, enabled, scopeArg, ctx = {}) {
|
|
128
|
+
if (scopeArg && !isScope(scopeArg)) {
|
|
129
|
+
console.error(`Unknown scope "${scopeArg}". Use one of: ${SCOPES.join(", ")}`);
|
|
130
|
+
process.exitCode = 1;
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
const { found, path } = setMcpServerDisabled({
|
|
134
|
+
...ctx,
|
|
135
|
+
name,
|
|
136
|
+
disabled: !enabled,
|
|
137
|
+
scope: scopeArg,
|
|
138
|
+
});
|
|
139
|
+
if (found)
|
|
140
|
+
console.log(`✓ ${enabled ? "Enabled" : "Disabled"} MCP server "${name}" (${path})`);
|
|
141
|
+
else {
|
|
142
|
+
console.error(`MCP server "${name}" not found.`);
|
|
143
|
+
process.exitCode = 1;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
export async function mcpCheck(name, ctx = {}) {
|
|
147
|
+
const { settings } = loadSettings({ ...ctx, noCache: true });
|
|
148
|
+
const servers = settings.mcpServers ?? {};
|
|
149
|
+
let entries;
|
|
150
|
+
if (name) {
|
|
151
|
+
const config = servers[name];
|
|
152
|
+
if (!config) {
|
|
153
|
+
console.error(`MCP server "${name}" not found.`);
|
|
154
|
+
process.exitCode = 1;
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
entries = [[name, config]];
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
entries = Object.entries(servers).filter(([, c]) => !("disabled" in c && c.disabled));
|
|
161
|
+
if (entries.length === 0) {
|
|
162
|
+
console.log("No enabled MCP servers to check.");
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
for (const [serverName, config] of entries) {
|
|
167
|
+
process.stdout.write(`Checking "${serverName}" (${config.transport})… `);
|
|
168
|
+
const result = await checkServer(serverName, config, settings);
|
|
169
|
+
if (!result.ok) {
|
|
170
|
+
console.log(`✗ ${result.error}`);
|
|
171
|
+
process.exitCode = 1;
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
const r = result.report;
|
|
175
|
+
console.log(`✓ ${result.total} tools`);
|
|
176
|
+
console.log(` advertised: ${r.advertised.length ? r.advertised.join(", ") : "(none)"}`);
|
|
177
|
+
if (r.hidden.length)
|
|
178
|
+
console.log(` hidden by visibility: ${r.hidden.join(", ")}`);
|
|
179
|
+
if (r.denied.length)
|
|
180
|
+
console.log(` denied by permissions: ${r.denied.join(", ")}`);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=mcp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"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"}
|