@orion-agents/orion-code 0.1.4-2 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +50 -20
- package/README.zh-CN.md +6 -5
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/context-commands.d.ts.map +1 -1
- package/dist/commands/context-commands.js +22 -0
- package/dist/commands/context-commands.js.map +1 -1
- package/dist/commands/context-tool-command-handlers.d.ts.map +1 -1
- package/dist/commands/context-tool-command-handlers.js +10 -3
- package/dist/commands/context-tool-command-handlers.js.map +1 -1
- package/dist/commands/core-command-handlers.d.ts +2 -2
- package/dist/commands/core-command-handlers.d.ts.map +1 -1
- package/dist/commands/core-command-handlers.js +65 -58
- package/dist/commands/core-command-handlers.js.map +1 -1
- package/dist/commands/diagnostic-command-handlers.d.ts.map +1 -1
- package/dist/commands/diagnostic-command-handlers.js +5 -5
- package/dist/commands/diagnostic-command-handlers.js.map +1 -1
- package/dist/commands/diagnostic-commands.d.ts.map +1 -1
- package/dist/commands/diagnostic-commands.js +43 -0
- package/dist/commands/diagnostic-commands.js.map +1 -1
- package/dist/commands/index.d.ts +4 -4
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +9 -2
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/legacy-commands.js +2 -2
- package/dist/commands/legacy-commands.js.map +1 -1
- package/dist/commands/model-command-handlers.d.ts +3 -1
- package/dist/commands/model-command-handlers.d.ts.map +1 -1
- package/dist/commands/model-command-handlers.js +293 -81
- package/dist/commands/model-command-handlers.js.map +1 -1
- package/dist/commands/model-commands.d.ts.map +1 -1
- package/dist/commands/model-commands.js +36 -3
- package/dist/commands/model-commands.js.map +1 -1
- package/dist/commands/parser.d.ts +12 -0
- package/dist/commands/parser.d.ts.map +1 -1
- package/dist/commands/parser.js +48 -7
- package/dist/commands/parser.js.map +1 -1
- package/dist/commands/registry.d.ts +4 -0
- package/dist/commands/registry.d.ts.map +1 -0
- package/dist/commands/registry.js +566 -0
- package/dist/commands/registry.js.map +1 -0
- package/dist/commands/session-command-handlers.d.ts +2 -1
- package/dist/commands/session-command-handlers.d.ts.map +1 -1
- package/dist/commands/session-command-handlers.js +119 -59
- package/dist/commands/session-command-handlers.js.map +1 -1
- package/dist/commands/session-commands.d.ts.map +1 -1
- package/dist/commands/session-commands.js +24 -0
- package/dist/commands/session-commands.js.map +1 -1
- package/dist/commands/system-commands.d.ts.map +1 -1
- package/dist/commands/system-commands.js +1 -13
- package/dist/commands/system-commands.js.map +1 -1
- package/dist/commands/types.d.ts +65 -1
- package/dist/commands/types.d.ts.map +1 -1
- package/dist/commands/types.js +3 -4
- package/dist/commands/types.js.map +1 -1
- package/dist/commands/workflow-command-handlers.d.ts.map +1 -1
- package/dist/commands/workflow-command-handlers.js +5 -8
- package/dist/commands/workflow-command-handlers.js.map +1 -1
- package/dist/commands/workflow-commands.d.ts.map +1 -1
- package/dist/commands/workflow-commands.js +36 -4
- package/dist/commands/workflow-commands.js.map +1 -1
- package/dist/core/cost-tracker.d.ts +12 -0
- package/dist/core/cost-tracker.d.ts.map +1 -1
- package/dist/core/cost-tracker.js +12 -6
- package/dist/core/cost-tracker.js.map +1 -1
- package/dist/framework/store.d.ts +11 -2
- package/dist/framework/store.d.ts.map +1 -1
- package/dist/framework/store.js +18 -0
- package/dist/framework/store.js.map +1 -1
- package/dist/framework/tool-scheduler.d.ts +1 -1
- package/dist/framework/tool-scheduler.d.ts.map +1 -1
- package/dist/framework/tool-scheduler.js +41 -27
- package/dist/framework/tool-scheduler.js.map +1 -1
- package/dist/framework/tool.d.ts +12 -0
- package/dist/framework/tool.d.ts.map +1 -1
- package/dist/framework/tool.js.map +1 -1
- package/dist/ink-ui/screens/ReplScreen.d.ts +2 -1
- package/dist/ink-ui/screens/ReplScreen.d.ts.map +1 -1
- package/dist/ink-ui/screens/ReplScreen.js +103 -31
- package/dist/ink-ui/screens/ReplScreen.js.map +1 -1
- package/dist/memory/storage.d.ts.map +1 -1
- package/dist/memory/storage.js +7 -1
- package/dist/memory/storage.js.map +1 -1
- package/dist/memory/vector-store.d.ts +18 -0
- package/dist/memory/vector-store.d.ts.map +1 -1
- package/dist/memory/vector-store.js +62 -40
- package/dist/memory/vector-store.js.map +1 -1
- package/dist/migration/migrate.d.ts.map +1 -1
- package/dist/migration/migrate.js +11 -5
- package/dist/migration/migrate.js.map +1 -1
- package/dist/print-ui/launch.d.ts +3 -0
- package/dist/print-ui/launch.d.ts.map +1 -1
- package/dist/print-ui/launch.js +10 -3
- package/dist/print-ui/launch.js.map +1 -1
- package/dist/product/paths.d.ts.map +1 -1
- package/dist/product/paths.js +4 -11
- package/dist/product/paths.js.map +1 -1
- package/dist/runtime/agent-runtime-controller.d.ts +2 -0
- package/dist/runtime/agent-runtime-controller.d.ts.map +1 -1
- package/dist/runtime/agent-runtime-controller.js +127 -14
- package/dist/runtime/agent-runtime-controller.js.map +1 -1
- package/dist/runtime/agent-runtime-protocol.d.ts +15 -0
- package/dist/runtime/agent-runtime-protocol.d.ts.map +1 -1
- package/dist/runtime/agent-runtime-protocol.js +6 -0
- package/dist/runtime/agent-runtime-protocol.js.map +1 -1
- package/dist/runtime/chat-controller.d.ts +0 -5
- package/dist/runtime/chat-controller.d.ts.map +1 -1
- package/dist/runtime/chat-controller.js +102 -14
- package/dist/runtime/chat-controller.js.map +1 -1
- package/dist/runtime/chat-effort.d.ts +5 -0
- package/dist/runtime/chat-effort.d.ts.map +1 -0
- package/dist/runtime/chat-effort.js +47 -0
- package/dist/runtime/chat-effort.js.map +1 -0
- package/dist/runtime/goals/prompt.d.ts.map +1 -1
- package/dist/runtime/goals/prompt.js +2 -2
- package/dist/runtime/goals/prompt.js.map +1 -1
- package/dist/runtime/rich-text/markdown-parser.d.ts +2 -0
- package/dist/runtime/rich-text/markdown-parser.d.ts.map +1 -1
- package/dist/runtime/rich-text/markdown-parser.js +50 -10
- package/dist/runtime/rich-text/markdown-parser.js.map +1 -1
- package/dist/runtime/ui-events.d.ts +32 -0
- package/dist/runtime/ui-events.d.ts.map +1 -1
- package/dist/runtime/ui-events.js.map +1 -1
- package/dist/runtime/ui-view-model.d.ts +13 -4
- package/dist/runtime/ui-view-model.d.ts.map +1 -1
- package/dist/runtime/ui-view-model.js +64 -10
- package/dist/runtime/ui-view-model.js.map +1 -1
- package/dist/services/concurrent-sessions.d.ts.map +1 -1
- package/dist/services/concurrent-sessions.js +28 -20
- package/dist/services/concurrent-sessions.js.map +1 -1
- package/dist/services/config.d.ts +2 -0
- package/dist/services/config.d.ts.map +1 -1
- package/dist/services/config.js +1 -0
- package/dist/services/config.js.map +1 -1
- package/dist/services/effort.d.ts +40 -0
- package/dist/services/effort.d.ts.map +1 -0
- package/dist/services/effort.js +88 -0
- package/dist/services/effort.js.map +1 -0
- package/dist/services/file-lock.d.ts.map +1 -1
- package/dist/services/file-lock.js +83 -29
- package/dist/services/file-lock.js.map +1 -1
- package/dist/services/global-config.d.ts +7 -0
- package/dist/services/global-config.d.ts.map +1 -1
- package/dist/services/global-config.js +12 -0
- package/dist/services/global-config.js.map +1 -1
- package/dist/services/llm.d.ts +23 -0
- package/dist/services/llm.d.ts.map +1 -1
- package/dist/services/llm.js +99 -3
- package/dist/services/llm.js.map +1 -1
- package/dist/services/model-registry.d.ts +3 -0
- package/dist/services/model-registry.d.ts.map +1 -1
- package/dist/services/model-registry.js +59 -2
- package/dist/services/model-registry.js.map +1 -1
- package/dist/services/provider-diagnostics.d.ts +1 -1
- package/dist/services/provider-diagnostics.d.ts.map +1 -1
- package/dist/services/provider-diagnostics.js +30 -16
- package/dist/services/provider-diagnostics.js.map +1 -1
- package/dist/services/provider-resilience/error-classifier.d.ts.map +1 -1
- package/dist/services/provider-resilience/error-classifier.js +15 -0
- package/dist/services/provider-resilience/error-classifier.js.map +1 -1
- package/dist/services/provider-resilience/types.d.ts +1 -1
- package/dist/services/provider-resilience/types.d.ts.map +1 -1
- package/dist/services/provider-resilience/types.js.map +1 -1
- package/dist/services/session-storage.d.ts +4 -0
- package/dist/services/session-storage.d.ts.map +1 -1
- package/dist/services/session-storage.js +252 -228
- package/dist/services/session-storage.js.map +1 -1
- package/dist/services/storage-maintenance.d.ts.map +1 -1
- package/dist/services/storage-maintenance.js +7 -7
- package/dist/services/storage-maintenance.js.map +1 -1
- package/dist/services/tool-allowlist.d.ts +20 -10
- package/dist/services/tool-allowlist.d.ts.map +1 -1
- package/dist/services/tool-allowlist.js +64 -15
- package/dist/services/tool-allowlist.js.map +1 -1
- package/dist/services/usage-state.d.ts +9 -0
- package/dist/services/usage-state.d.ts.map +1 -1
- package/dist/services/usage-state.js +35 -0
- package/dist/services/usage-state.js.map +1 -1
- package/dist/terminal-ui/launch.d.ts +10 -0
- package/dist/terminal-ui/launch.d.ts.map +1 -1
- package/dist/terminal-ui/launch.js +58 -37
- package/dist/terminal-ui/launch.js.map +1 -1
- package/dist/tools/bash_security.d.ts +9 -0
- package/dist/tools/bash_security.d.ts.map +1 -1
- package/dist/tools/bash_security.js +32 -0
- package/dist/tools/bash_security.js.map +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +40 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tui-ui/launch.d.ts.map +1 -1
- package/dist/tui-ui/launch.js +3 -3
- package/dist/tui-ui/launch.js.map +1 -1
- package/dist/tui-ui/layout.js +7 -3
- package/dist/tui-ui/layout.js.map +1 -1
- package/dist/tui-ui/pickers.d.ts.map +1 -1
- package/dist/tui-ui/pickers.js +1 -0
- package/dist/tui-ui/pickers.js.map +1 -1
- package/dist/tui-ui/runner.d.ts +2 -1
- package/dist/tui-ui/runner.d.ts.map +1 -1
- package/dist/tui-ui/runner.js +17 -29
- package/dist/tui-ui/runner.js.map +1 -1
- package/dist/tui-ui/state.d.ts +4 -0
- package/dist/tui-ui/state.d.ts.map +1 -1
- package/dist/tui-ui/state.js +15 -1
- package/dist/tui-ui/state.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Orion Code -
|
|
3
|
+
* Orion Code - scoped tool allowlist rule engine.
|
|
4
4
|
*
|
|
5
5
|
* Contract (v0.1.3-2 §1.3 / P1-B / P1-E)
|
|
6
6
|
* ======================================
|
|
7
7
|
*
|
|
8
8
|
* Scope
|
|
9
9
|
* -----
|
|
10
|
-
*
|
|
11
|
-
* `
|
|
12
|
-
*
|
|
13
|
-
*
|
|
10
|
+
* Project rules live in `ProjectConfig.allowedTools`; machine-wide rules live in
|
|
11
|
+
* `GlobalConfig.allowedTools`. Both are evaluated for a project and the most
|
|
12
|
+
* restrictive matching effect wins. Project rules win ties for clearer audit
|
|
13
|
+
* attribution.
|
|
14
14
|
*
|
|
15
15
|
* Grammar
|
|
16
16
|
* -------
|
|
@@ -39,11 +39,10 @@
|
|
|
39
39
|
*
|
|
40
40
|
* Safety envelope (enforced by the scheduler, documented here)
|
|
41
41
|
* -----------------------------------------------------------
|
|
42
|
-
* `allow`
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
* policy, so a project can always tighten but never silently loosen the gates.
|
|
42
|
+
* `allow` is an explicit durable approval and can downgrade an interactive
|
|
43
|
+
* confirmation for tools with known risk metadata. It can never override
|
|
44
|
+
* `checkPermissions() === 'deny'`, plan mode, an `ask`/`deny` rule, or missing
|
|
45
|
+
* risk metadata.
|
|
47
46
|
*
|
|
48
47
|
* Compatibility
|
|
49
48
|
* -------------
|
|
@@ -53,13 +52,18 @@
|
|
|
53
52
|
* meaning ("auto-approve this tool").
|
|
54
53
|
*/
|
|
55
54
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
56
|
-
exports.SUBJECT_ARG_KEYS = void 0;
|
|
55
|
+
exports.resolveToolAllowlist = exports.SUBJECT_ARG_KEYS = void 0;
|
|
56
|
+
exports.isToolPermissionScope = isToolPermissionScope;
|
|
57
57
|
exports.parseAllowlistRules = parseAllowlistRules;
|
|
58
58
|
exports.describeAllowlistSubject = describeAllowlistSubject;
|
|
59
59
|
exports.matchAllowlistRules = matchAllowlistRules;
|
|
60
60
|
exports.createAllowlistEvaluator = createAllowlistEvaluator;
|
|
61
61
|
exports.resolveProjectToolAllowlist = resolveProjectToolAllowlist;
|
|
62
|
+
exports.grantToolPermission = grantToolPermission;
|
|
62
63
|
const global_config_1 = require("./global-config");
|
|
64
|
+
function isToolPermissionScope(value) {
|
|
65
|
+
return value === 'once' || value === 'project' || value === 'global';
|
|
66
|
+
}
|
|
63
67
|
// ============================================================================
|
|
64
68
|
// Parsing
|
|
65
69
|
// ============================================================================
|
|
@@ -237,14 +241,59 @@ function createAllowlistEvaluator(rules) {
|
|
|
237
241
|
* Missing/empty configuration yields no evaluator, i.e. unchanged behaviour.
|
|
238
242
|
*/
|
|
239
243
|
function resolveProjectToolAllowlist(projectPath) {
|
|
240
|
-
let
|
|
244
|
+
let globalEntries;
|
|
245
|
+
let projectEntries;
|
|
241
246
|
try {
|
|
242
|
-
|
|
247
|
+
const config = (0, global_config_1.loadGlobalConfig)();
|
|
248
|
+
globalEntries = config.allowedTools;
|
|
249
|
+
projectEntries = config.projects?.[projectPath]?.allowedTools;
|
|
243
250
|
}
|
|
244
251
|
catch {
|
|
245
|
-
|
|
252
|
+
globalEntries = undefined;
|
|
253
|
+
projectEntries = undefined;
|
|
254
|
+
}
|
|
255
|
+
const global = parseAllowlistRules(globalEntries);
|
|
256
|
+
const project = parseAllowlistRules(projectEntries);
|
|
257
|
+
const rules = [...global.rules, ...project.rules];
|
|
258
|
+
const invalid = [...global.invalid, ...project.invalid];
|
|
259
|
+
const globalEvaluator = createAllowlistEvaluator(global.rules);
|
|
260
|
+
const projectEvaluator = createAllowlistEvaluator(project.rules);
|
|
261
|
+
const evaluator = globalEvaluator || projectEvaluator
|
|
262
|
+
? (toolName, args) => {
|
|
263
|
+
const globalMatch = globalEvaluator?.(toolName, args);
|
|
264
|
+
const projectMatch = projectEvaluator?.(toolName, args);
|
|
265
|
+
if (!globalMatch)
|
|
266
|
+
return projectMatch ? { ...projectMatch, scope: 'project' } : undefined;
|
|
267
|
+
if (!projectMatch)
|
|
268
|
+
return { ...globalMatch, scope: 'global' };
|
|
269
|
+
return EFFECT_RANK[projectMatch.effect] >= EFFECT_RANK[globalMatch.effect]
|
|
270
|
+
? { ...projectMatch, scope: 'project' }
|
|
271
|
+
: { ...globalMatch, scope: 'global' };
|
|
272
|
+
}
|
|
273
|
+
: undefined;
|
|
274
|
+
return { rules, invalid, global, project, evaluator };
|
|
275
|
+
}
|
|
276
|
+
/** Alias with scope-neutral naming for new callers. */
|
|
277
|
+
exports.resolveToolAllowlist = resolveProjectToolAllowlist;
|
|
278
|
+
function appendToolGrant(entries, toolName) {
|
|
279
|
+
if (!TOOL_NAME_RE.test(toolName) || toolName === '*' || toolName.includes('*')) {
|
|
280
|
+
throw new Error(`Cannot persist permission for invalid tool name: ${toolName}`);
|
|
246
281
|
}
|
|
247
282
|
const parsed = parseAllowlistRules(entries);
|
|
248
|
-
|
|
283
|
+
const alreadyGranted = parsed.rules.some(rule => rule.effect === 'allow' && rule.tool === toolName && rule.pattern === undefined);
|
|
284
|
+
return alreadyGranted ? [...(entries ?? [])] : [...(entries ?? []), `allow:${toolName}`];
|
|
285
|
+
}
|
|
286
|
+
/** Persist an explicit interactive approval before the waiting tool is resumed. */
|
|
287
|
+
function grantToolPermission(scope, projectPath, toolName) {
|
|
288
|
+
if (scope === 'global') {
|
|
289
|
+
const config = (0, global_config_1.loadGlobalConfig)();
|
|
290
|
+
(0, global_config_1.updateGlobalConfig)({ allowedTools: appendToolGrant(config.allowedTools, toolName) });
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
const project = (0, global_config_1.getProjectConfig)(projectPath);
|
|
294
|
+
(0, global_config_1.saveProjectConfig)(projectPath, {
|
|
295
|
+
...project,
|
|
296
|
+
allowedTools: appendToolGrant(project.allowedTools, toolName),
|
|
297
|
+
});
|
|
249
298
|
}
|
|
250
299
|
//# sourceMappingURL=tool-allowlist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-allowlist.js","sourceRoot":"","sources":["../../src/services/tool-allowlist.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"tool-allowlist.js","sourceRoot":"","sources":["../../src/services/tool-allowlist.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
* audited or rebuilt after an interrupted write.
|
|
7
7
|
*/
|
|
8
8
|
import type { CostSource, UsageRecord } from '../core/cost-tracker';
|
|
9
|
+
import { type EffortLevel, type ResolvedEffort } from './effort';
|
|
10
|
+
import type { ProviderProtocol } from './model-registry';
|
|
9
11
|
export interface UsageState {
|
|
10
12
|
schemaVersion: 2;
|
|
11
13
|
totalSessions: number;
|
|
@@ -36,10 +38,17 @@ export interface UsageLedgerEntry {
|
|
|
36
38
|
requestKind?: string;
|
|
37
39
|
agentId?: string;
|
|
38
40
|
taskId?: string;
|
|
41
|
+
/** Subset of completionTokens; never added to totalTokens again. */
|
|
42
|
+
reasoningTokens?: number;
|
|
43
|
+
effortRequested?: import('./effort').EffortPreference;
|
|
44
|
+
effortEffective?: EffortLevel;
|
|
45
|
+
effortSource?: ResolvedEffort['source'];
|
|
46
|
+
providerProtocol?: ProviderProtocol;
|
|
39
47
|
}
|
|
40
48
|
export interface UsageLedgerSummary {
|
|
41
49
|
promptTokens: number;
|
|
42
50
|
completionTokens: number;
|
|
51
|
+
reasoningTokens: number;
|
|
43
52
|
totalTokens: number;
|
|
44
53
|
totalCost: number;
|
|
45
54
|
providerCost: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-state.d.ts","sourceRoot":"","sources":["../../src/services/usage-state.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"usage-state.d.ts","sourceRoot":"","sources":["../../src/services/usage-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const crypto_1 = require("crypto");
|
|
|
20
20
|
const atomic_write_1 = require("./atomic-write");
|
|
21
21
|
const file_lock_1 = require("./file-lock");
|
|
22
22
|
const config_dir_1 = require("./config-dir");
|
|
23
|
+
const effort_1 = require("./effort");
|
|
23
24
|
const debug_log_1 = require("../utils/debug-log");
|
|
24
25
|
const USAGE_SCHEMA_VERSION = 2;
|
|
25
26
|
function nowIso() {
|
|
@@ -52,6 +53,7 @@ function emptyLedgerSummary() {
|
|
|
52
53
|
return {
|
|
53
54
|
promptTokens: 0,
|
|
54
55
|
completionTokens: 0,
|
|
56
|
+
reasoningTokens: 0,
|
|
55
57
|
totalTokens: 0,
|
|
56
58
|
totalCost: 0,
|
|
57
59
|
providerCost: 0,
|
|
@@ -70,6 +72,20 @@ function emptyLedgerSummary() {
|
|
|
70
72
|
function isCostSource(value) {
|
|
71
73
|
return (value === 'provider' || value === 'configured' || value === 'builtin' || value === 'fallback');
|
|
72
74
|
}
|
|
75
|
+
function isEffortLevel(value) {
|
|
76
|
+
return value !== 'auto' && (0, effort_1.isEffortPreference)(value);
|
|
77
|
+
}
|
|
78
|
+
function isEffortSource(value) {
|
|
79
|
+
return (value === 'request' ||
|
|
80
|
+
value === 'session' ||
|
|
81
|
+
value === 'project' ||
|
|
82
|
+
value === 'global' ||
|
|
83
|
+
value === 'model-default' ||
|
|
84
|
+
value === 'provider-default');
|
|
85
|
+
}
|
|
86
|
+
function isProviderProtocol(value) {
|
|
87
|
+
return value === 'openai-completions' || value === 'anthropic-messages';
|
|
88
|
+
}
|
|
73
89
|
function normalizeLedgerEntry(value) {
|
|
74
90
|
if (!value || typeof value !== 'object')
|
|
75
91
|
return null;
|
|
@@ -93,6 +109,19 @@ function normalizeLedgerEntry(value) {
|
|
|
93
109
|
...(typeof entry.requestKind === 'string' ? { requestKind: entry.requestKind } : {}),
|
|
94
110
|
...(typeof entry.agentId === 'string' ? { agentId: entry.agentId } : {}),
|
|
95
111
|
...(typeof entry.taskId === 'string' ? { taskId: entry.taskId } : {}),
|
|
112
|
+
...(entry.reasoningTokens !== undefined
|
|
113
|
+
? {
|
|
114
|
+
reasoningTokens: Math.min(toNonNegativeNumber(entry.completionTokens), toNonNegativeNumber(entry.reasoningTokens)),
|
|
115
|
+
}
|
|
116
|
+
: {}),
|
|
117
|
+
...((0, effort_1.isEffortPreference)(entry.effortRequested)
|
|
118
|
+
? { effortRequested: entry.effortRequested }
|
|
119
|
+
: {}),
|
|
120
|
+
...(isEffortLevel(entry.effortEffective) ? { effortEffective: entry.effortEffective } : {}),
|
|
121
|
+
...(isEffortSource(entry.effortSource) ? { effortSource: entry.effortSource } : {}),
|
|
122
|
+
...(isProviderProtocol(entry.providerProtocol)
|
|
123
|
+
? { providerProtocol: entry.providerProtocol }
|
|
124
|
+
: {}),
|
|
96
125
|
};
|
|
97
126
|
}
|
|
98
127
|
function readUsageLedger() {
|
|
@@ -133,6 +162,7 @@ function summarizeUsageLedger(entries) {
|
|
|
133
162
|
for (const entry of read.entries) {
|
|
134
163
|
summary.promptTokens += entry.promptTokens;
|
|
135
164
|
summary.completionTokens += entry.completionTokens;
|
|
165
|
+
summary.reasoningTokens += entry.reasoningTokens ?? 0;
|
|
136
166
|
summary.totalTokens += entry.totalTokens;
|
|
137
167
|
summary.totalCost += entry.costUsd;
|
|
138
168
|
summary.recordCount++;
|
|
@@ -283,6 +313,11 @@ function appendUsageRecord(record, context = {}) {
|
|
|
283
313
|
...(record.requestKind ? { requestKind: record.requestKind } : {}),
|
|
284
314
|
...(record.agentId ? { agentId: record.agentId } : {}),
|
|
285
315
|
...(record.taskId ? { taskId: record.taskId } : {}),
|
|
316
|
+
...(record.reasoningTokens !== undefined ? { reasoningTokens: record.reasoningTokens } : {}),
|
|
317
|
+
...(record.effortRequested !== undefined ? { effortRequested: record.effortRequested } : {}),
|
|
318
|
+
...(record.effortEffective !== undefined ? { effortEffective: record.effortEffective } : {}),
|
|
319
|
+
...(record.effortSource !== undefined ? { effortSource: record.effortSource } : {}),
|
|
320
|
+
...(record.providerProtocol !== undefined ? { providerProtocol: record.providerProtocol } : {}),
|
|
286
321
|
};
|
|
287
322
|
(0, fs_1.appendFileSync)((0, config_dir_1.getUsageLedgerPath)(), `${JSON.stringify(entry)}\n`, {
|
|
288
323
|
encoding: 'utf-8',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-state.js","sourceRoot":"","sources":["../../src/services/usage-state.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"usage-state.js","sourceRoot":"","sources":["../../src/services/usage-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type AgentRuntimeInput } from '../runtime/agent-runtime-controller';
|
|
2
2
|
import { type ModelPickerItem, type SessionPickerItem, type ResearchStatusProjection, type SubtaskTimelineEntry } from '../runtime/ui-view-model';
|
|
3
|
+
import type { ToolPermissionScope } from '../services/tool-allowlist';
|
|
3
4
|
import type { EditPreviewRequest, ModelPickerRequest, OrionCodeUiRuntime, RuntimeSessionRestoredEvent, RuntimeSubtaskEvent, SessionPickerRequest, TranscriptAppendEntry, TranscriptEntry, ToolPermissionRequest, UiEventSink } from '../runtime/ui-events';
|
|
4
5
|
import type { ResearchLifecycleEvent } from '../runtime/subagents/research-renderer';
|
|
5
6
|
import type { GoalRuntimeEvent } from '../runtime/goals/types';
|
|
@@ -71,6 +72,7 @@ export declare class TerminalEventSink implements UiEventSink {
|
|
|
71
72
|
private readonly subtaskTimeline;
|
|
72
73
|
private researchEvents;
|
|
73
74
|
private researchProjection;
|
|
75
|
+
private readonly effortEvents;
|
|
74
76
|
private static readonly MAX_FINALIZED_METADATA;
|
|
75
77
|
private static readonly MAX_PRINTED_CONTENT;
|
|
76
78
|
private static readonly MAX_SUBTASK_TIMELINE;
|
|
@@ -108,6 +110,8 @@ export declare class TerminalEventSink implements UiEventSink {
|
|
|
108
110
|
getSubtaskTimeline(): SubtaskTimelineEntry[];
|
|
109
111
|
/** Consume and visibly render the shared research lifecycle stream. */
|
|
110
112
|
researchEvent(event: ResearchLifecycleEvent): void;
|
|
113
|
+
effortEvent(event: import('../runtime/ui-events').RuntimeEffortEvent): void;
|
|
114
|
+
getEffortEvents(): import('../runtime/ui-events').RuntimeEffortEvent[];
|
|
111
115
|
/** Ordered, bounded research audit history for parity and renderer diagnostics. */
|
|
112
116
|
getResearchEvents(): ResearchLifecycleEvent[];
|
|
113
117
|
getResearchProjection(): ResearchStatusProjection | null;
|
|
@@ -129,6 +133,12 @@ export declare function renderTerminalBanner(runtime: OrionCodeUiRuntime): strin
|
|
|
129
133
|
export declare function renderTerminalContextStatus(runtime: OrionCodeUiRuntime): string;
|
|
130
134
|
export declare function promptText(runtime: OrionCodeUiRuntime): string;
|
|
131
135
|
export declare function formatTerminalPermissionPrompt(request: ToolPermissionRequest, cwd: string): string;
|
|
136
|
+
export interface TerminalPermissionDecision {
|
|
137
|
+
approved: boolean;
|
|
138
|
+
scope: ToolPermissionScope;
|
|
139
|
+
}
|
|
140
|
+
/** Parse a deliberate response; invalid input leaves the permission prompt pending. */
|
|
141
|
+
export declare function parseTerminalPermissionAnswer(answer: string): TerminalPermissionDecision | undefined;
|
|
132
142
|
export declare function parseEditInput(input: string): {
|
|
133
143
|
isEdit: boolean;
|
|
134
144
|
initialContent: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../src/terminal-ui/launch.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAcL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../src/terminal-ui/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ exports.renderTerminalBanner = renderTerminalBanner;
|
|
|
24
24
|
exports.renderTerminalContextStatus = renderTerminalContextStatus;
|
|
25
25
|
exports.promptText = promptText;
|
|
26
26
|
exports.formatTerminalPermissionPrompt = formatTerminalPermissionPrompt;
|
|
27
|
+
exports.parseTerminalPermissionAnswer = parseTerminalPermissionAnswer;
|
|
27
28
|
exports.parseEditInput = parseEditInput;
|
|
28
29
|
exports.renderTerminalShortcuts = renderTerminalShortcuts;
|
|
29
30
|
exports.normalizeTerminalAnswer = normalizeTerminalAnswer;
|
|
@@ -382,7 +383,9 @@ function formatTerminalModelPickerItem(item, width = terminalContentWidth(120))
|
|
|
382
383
|
const marker = item.isCurrent ? ACCENT('●') : DIM('○');
|
|
383
384
|
const alias = item.alias ? ` (${item.alias})` : '';
|
|
384
385
|
const context = formatModelTokenCount(item.contextWindow);
|
|
385
|
-
const output = item.maxOutputTokens
|
|
386
|
+
const output = item.maxOutputTokens
|
|
387
|
+
? formatModelTokenCount(item.maxOutputTokens).replace('ctx', 'out')
|
|
388
|
+
: '';
|
|
386
389
|
const provider = item.provider ?? 'unknown';
|
|
387
390
|
const description = [provider, context, output].filter(Boolean).join(' ');
|
|
388
391
|
const row = `${marker} ${ACCENT(`${item.name}${alias}`)} ${DIM(description)}`;
|
|
@@ -450,6 +453,7 @@ class TerminalEventSink {
|
|
|
450
453
|
this.subtaskTimeline = new Map();
|
|
451
454
|
this.researchEvents = [];
|
|
452
455
|
this.researchProjection = null;
|
|
456
|
+
this.effortEvents = [];
|
|
453
457
|
}
|
|
454
458
|
append(entry) {
|
|
455
459
|
const id = `terminal-${++this.idCounter}`;
|
|
@@ -784,6 +788,14 @@ class TerminalEventSink {
|
|
|
784
788
|
this.researchProjection = (0, ui_view_model_1.projectResearchLifecycleEvent)(this.researchProjection, event);
|
|
785
789
|
this.writer.write(`${DIM((0, ui_view_model_1.formatResearchLifecycleEvent)(event, 'terminal'))}\n`);
|
|
786
790
|
}
|
|
791
|
+
effortEvent(event) {
|
|
792
|
+
this.effortEvents.push(event);
|
|
793
|
+
const effective = 'effective' in event ? (event.effective ?? 'provider-default') : 'unavailable';
|
|
794
|
+
this.writer.write(`${DIM(`effort:${event.requested}/${effective}`)}\n`);
|
|
795
|
+
}
|
|
796
|
+
getEffortEvents() {
|
|
797
|
+
return [...this.effortEvents];
|
|
798
|
+
}
|
|
787
799
|
/** Ordered, bounded research audit history for parity and renderer diagnostics. */
|
|
788
800
|
getResearchEvents() {
|
|
789
801
|
return [...this.researchEvents];
|
|
@@ -890,7 +902,7 @@ function compactPermissionValue(value, maxWidth) {
|
|
|
890
902
|
}
|
|
891
903
|
function formatTerminalPermissionScope(state) {
|
|
892
904
|
const width = terminalContentWidth(120);
|
|
893
|
-
const maxScopeWidth = Math.max(
|
|
905
|
+
const maxScopeWidth = Math.max(8, width - 2);
|
|
894
906
|
return compactPermissionValue((0, ui_view_model_1.permissionScopeDisplayValue)(state.scope), maxScopeWidth);
|
|
895
907
|
}
|
|
896
908
|
function formatTerminalPermissionPrompt(request, cwd) {
|
|
@@ -898,38 +910,37 @@ function formatTerminalPermissionPrompt(request, cwd) {
|
|
|
898
910
|
const width = terminalContentWidth(120);
|
|
899
911
|
const budget = Math.max(1, width);
|
|
900
912
|
const base = `${ACCENT('?')} Allow tool ${ACCENT(state.toolName)}?`;
|
|
901
|
-
const options = DIM(`[${state.options.
|
|
913
|
+
const options = DIM(`[${state.options.once} ${state.options.project} ${state.options.global} ${state.options.deny}]`);
|
|
902
914
|
const scope = DIM(formatTerminalPermissionScope(state));
|
|
903
|
-
const cwdLabel = DIM(`cwd=${compactPermissionValue(state.cwd, Math.max(
|
|
904
|
-
const risk = DIM(`risk=${compactPermissionValue((0, ui_view_model_1.permissionRiskDisplayValue)(state.risk), Math.max(
|
|
905
|
-
const
|
|
906
|
-
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
915
|
-
|
|
916
|
-
|
|
917
|
-
|
|
918
|
-
|
|
919
|
-
|
|
920
|
-
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
return `${truncateTerminalText(stripTrailingNewlines(base), baseBudget)} ${options} `;
|
|
915
|
+
const cwdLabel = DIM(`cwd=${compactPermissionValue(state.cwd, Math.max(8, width - 4))}`);
|
|
916
|
+
const risk = DIM(`risk=${compactPermissionValue((0, ui_view_model_1.permissionRiskDisplayValue)(state.risk), Math.max(8, width - 5))}`);
|
|
917
|
+
const rows = [base, `${scope} ${cwdLabel}`, risk, options].map(row => truncateTerminalText(stripTrailingNewlines(row), budget));
|
|
918
|
+
const inputMarker = budget >= 2 ? `${ACCENT('>')} ` : ACCENT('>');
|
|
919
|
+
return `${rows.join('\n')}\n${inputMarker}`;
|
|
920
|
+
}
|
|
921
|
+
/** Parse a deliberate response; invalid input leaves the permission prompt pending. */
|
|
922
|
+
function parseTerminalPermissionAnswer(answer) {
|
|
923
|
+
switch (answer.trim().toLowerCase()) {
|
|
924
|
+
case '1':
|
|
925
|
+
case 'y':
|
|
926
|
+
case 'yes':
|
|
927
|
+
case 'once':
|
|
928
|
+
return { approved: true, scope: 'once' };
|
|
929
|
+
case '2':
|
|
930
|
+
case 'p':
|
|
931
|
+
case 'project':
|
|
932
|
+
return { approved: true, scope: 'project' };
|
|
933
|
+
case '3':
|
|
934
|
+
case 'g':
|
|
935
|
+
case 'global':
|
|
936
|
+
return { approved: true, scope: 'global' };
|
|
937
|
+
case 'n':
|
|
938
|
+
case 'no':
|
|
939
|
+
case 'deny':
|
|
940
|
+
return { approved: false, scope: 'once' };
|
|
941
|
+
default:
|
|
942
|
+
return undefined;
|
|
943
|
+
}
|
|
933
944
|
}
|
|
934
945
|
function parseEditInput(input) {
|
|
935
946
|
const trimmed = input.trimStart();
|
|
@@ -1150,13 +1161,23 @@ async function launchTerminalUI(runtime) {
|
|
|
1150
1161
|
return undefined;
|
|
1151
1162
|
}
|
|
1152
1163
|
confirmingTool = true;
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
1164
|
+
const askUntilValid = async () => {
|
|
1165
|
+
while (!event.request.abortSignal?.aborted && !stopping) {
|
|
1166
|
+
const answer = await editor.ask(formatTerminalPermissionPrompt(event.request, runtime.cwd), event.request.abortSignal);
|
|
1167
|
+
const decision = parseTerminalPermissionAnswer(answer);
|
|
1168
|
+
if (decision)
|
|
1169
|
+
return decision;
|
|
1170
|
+
writer.write(`${WARNING('Please choose 1, 2, 3, or n.')}\n`);
|
|
1171
|
+
}
|
|
1172
|
+
return { approved: false, scope: 'once' };
|
|
1173
|
+
};
|
|
1174
|
+
void askUntilValid()
|
|
1175
|
+
.then(decision => {
|
|
1156
1176
|
agentController.handle({
|
|
1157
1177
|
type: 'permission_decision',
|
|
1158
1178
|
requestId: event.request.id,
|
|
1159
|
-
approved:
|
|
1179
|
+
approved: decision.approved,
|
|
1180
|
+
scope: decision.scope,
|
|
1160
1181
|
source: 'keyboard',
|
|
1161
1182
|
});
|
|
1162
1183
|
})
|