@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
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EFFORT_LEVELS = void 0;
|
|
4
|
+
exports.isEffortPreference = isEffortPreference;
|
|
5
|
+
exports.resolveEffort = resolveEffort;
|
|
6
|
+
exports.buildProviderEffortParams = buildProviderEffortParams;
|
|
7
|
+
exports.resolveProfileEffort = resolveProfileEffort;
|
|
8
|
+
exports.EFFORT_LEVELS = [
|
|
9
|
+
'none',
|
|
10
|
+
'minimal',
|
|
11
|
+
'low',
|
|
12
|
+
'medium',
|
|
13
|
+
'high',
|
|
14
|
+
'xhigh',
|
|
15
|
+
'max',
|
|
16
|
+
];
|
|
17
|
+
function isEffortPreference(value) {
|
|
18
|
+
return value === 'auto' || exports.EFFORT_LEVELS.includes(value);
|
|
19
|
+
}
|
|
20
|
+
function resolveEffort(input) {
|
|
21
|
+
const candidates = [
|
|
22
|
+
['request', input.request],
|
|
23
|
+
['session', input.session],
|
|
24
|
+
['project', input.project],
|
|
25
|
+
['global', input.global],
|
|
26
|
+
];
|
|
27
|
+
const selected = candidates.find(([, value]) => value !== undefined && value !== 'auto');
|
|
28
|
+
const requested = selected?.[1] ?? 'auto';
|
|
29
|
+
const source = selected?.[0] ?? 'provider-default';
|
|
30
|
+
const capability = input.capability;
|
|
31
|
+
if (!capability) {
|
|
32
|
+
return {
|
|
33
|
+
requested,
|
|
34
|
+
source,
|
|
35
|
+
supported: false,
|
|
36
|
+
supportedLevels: [],
|
|
37
|
+
warning: 'capability levels and provider adapter are not configured',
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
if (requested === 'auto') {
|
|
41
|
+
return {
|
|
42
|
+
requested,
|
|
43
|
+
effective: capability.defaultLevel,
|
|
44
|
+
source: capability.defaultLevel ? 'model-default' : 'provider-default',
|
|
45
|
+
capabilitySource: capability.source,
|
|
46
|
+
supported: true,
|
|
47
|
+
supportedLevels: [...capability.supportedLevels],
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
if (!capability.supportedLevels.includes(requested)) {
|
|
51
|
+
return {
|
|
52
|
+
requested,
|
|
53
|
+
source,
|
|
54
|
+
capabilitySource: capability.source,
|
|
55
|
+
supported: false,
|
|
56
|
+
supportedLevels: [...capability.supportedLevels],
|
|
57
|
+
warning: `effort ${requested} is not supported; choose ${capability.supportedLevels.join(', ')}`,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
return {
|
|
61
|
+
requested,
|
|
62
|
+
effective: requested,
|
|
63
|
+
source,
|
|
64
|
+
capabilitySource: capability.source,
|
|
65
|
+
supported: true,
|
|
66
|
+
supportedLevels: [...capability.supportedLevels],
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
/** Build an immutable provider fragment. `auto` intentionally sends no override. */
|
|
70
|
+
function buildProviderEffortParams(snapshot) {
|
|
71
|
+
if (!snapshot.resolved.supported ||
|
|
72
|
+
snapshot.resolved.requested === 'auto' ||
|
|
73
|
+
!snapshot.resolved.effective ||
|
|
74
|
+
!snapshot.capability) {
|
|
75
|
+
return {};
|
|
76
|
+
}
|
|
77
|
+
if (snapshot.protocol === 'openai-completions' &&
|
|
78
|
+
snapshot.capability.adapter === 'openai-chat-reasoning-effort') {
|
|
79
|
+
return { reasoning_effort: snapshot.resolved.effective };
|
|
80
|
+
}
|
|
81
|
+
// Anthropic Messages is not sent through Orion's current OpenAI SDK seam.
|
|
82
|
+
// Keep it unavailable until a native protocol adapter owns the full request.
|
|
83
|
+
return {};
|
|
84
|
+
}
|
|
85
|
+
function resolveProfileEffort(profile, preferences) {
|
|
86
|
+
return resolveEffort({ ...preferences, capability: profile?.reasoningCapability });
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=effort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"effort.js","sourceRoot":"","sources":["../../src/services/effort.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.d.ts","sourceRoot":"","sources":["../../src/services/file-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-lock.d.ts","sourceRoot":"","sources":["../../src/services/file-lock.ts"],"names":[],"mappings":"AA8LA,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,CAAC,EAClB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACpE,CAAC,CAmBH"}
|
|
@@ -7,6 +7,7 @@ const debug_log_1 = require("../utils/debug-log");
|
|
|
7
7
|
const DEFAULT_WAIT_MS = 2000;
|
|
8
8
|
const DEFAULT_RETRY_MS = 10;
|
|
9
9
|
const DEFAULT_STALE_MS = 30000;
|
|
10
|
+
const RECOVERY_SUFFIX = '.recovery';
|
|
10
11
|
function sleepSync(ms) {
|
|
11
12
|
const signal = new Int32Array(new SharedArrayBuffer(4));
|
|
12
13
|
Atomics.wait(signal, 0, 0, ms);
|
|
@@ -77,33 +78,56 @@ function recoverStaleLock(lockPath, staleMs) {
|
|
|
77
78
|
}
|
|
78
79
|
return true;
|
|
79
80
|
}
|
|
80
|
-
function
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
const
|
|
81
|
+
function createLock(lockPath) {
|
|
82
|
+
const owner = { token: (0, crypto_1.randomUUID)(), pid: process.pid, createdAt: Date.now() };
|
|
83
|
+
try {
|
|
84
|
+
const fd = (0, fs_1.openSync)(lockPath, 'wx', 0o600);
|
|
84
85
|
try {
|
|
85
|
-
|
|
86
|
+
(0, fs_1.writeFileSync)(fd, JSON.stringify(owner));
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
86
89
|
try {
|
|
87
|
-
(0, fs_1.
|
|
88
|
-
}
|
|
89
|
-
catch (error) {
|
|
90
|
-
try {
|
|
91
|
-
(0, fs_1.unlinkSync)(lockPath);
|
|
92
|
-
}
|
|
93
|
-
catch (cleanupError) {
|
|
94
|
-
(0, debug_log_1.debugError)('file-lock.initializeCleanup', cleanupError, lockPath);
|
|
95
|
-
}
|
|
96
|
-
throw error;
|
|
90
|
+
(0, fs_1.unlinkSync)(lockPath);
|
|
97
91
|
}
|
|
98
|
-
|
|
99
|
-
(0,
|
|
92
|
+
catch (cleanupError) {
|
|
93
|
+
(0, debug_log_1.debugError)('file-lock.initializeCleanup', cleanupError, lockPath);
|
|
100
94
|
}
|
|
101
|
-
|
|
95
|
+
throw error;
|
|
102
96
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
97
|
+
finally {
|
|
98
|
+
(0, fs_1.closeSync)(fd);
|
|
99
|
+
}
|
|
100
|
+
return owner;
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
if (error.code === 'EEXIST')
|
|
104
|
+
return null;
|
|
105
|
+
throw error;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
function releaseOwnedLock(lockPath, owner, scope) {
|
|
109
|
+
try {
|
|
110
|
+
if ((0, fs_1.existsSync)(lockPath) && readOwner(lockPath)?.token === owner.token) {
|
|
111
|
+
(0, fs_1.unlinkSync)(lockPath);
|
|
106
112
|
}
|
|
113
|
+
else {
|
|
114
|
+
(0, debug_log_1.debugError)(`${scope}Ownership`, new Error('lock ownership changed'), lockPath);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
(0, debug_log_1.debugError)(scope, error, lockPath);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Acquire a lock without a recovery sentinel. This is used only for the short-
|
|
123
|
+
* lived recovery sentinel itself; normal locks must use acquireLock().
|
|
124
|
+
*/
|
|
125
|
+
function acquirePrimitiveLock(lockPath, options) {
|
|
126
|
+
const deadline = Date.now() + options.waitMs;
|
|
127
|
+
while (true) {
|
|
128
|
+
const owner = createLock(lockPath);
|
|
129
|
+
if (owner)
|
|
130
|
+
return owner;
|
|
107
131
|
if (recoverStaleLock(lockPath, options.staleMs))
|
|
108
132
|
continue;
|
|
109
133
|
if (Date.now() >= deadline)
|
|
@@ -111,25 +135,55 @@ function acquireLock(lockPath, options) {
|
|
|
111
135
|
sleepSync(options.retryMs);
|
|
112
136
|
}
|
|
113
137
|
}
|
|
138
|
+
function withRecoverySentinel(lockPath, options, operation) {
|
|
139
|
+
// Every main-lock acquire, stale recovery, and release passes through this
|
|
140
|
+
// short-lived sentinel, so a checked stale main lock cannot be replaced
|
|
141
|
+
// before it is renamed. The primitive sentinel still treats a live owner as
|
|
142
|
+
// authoritative and fails closed on contention.
|
|
143
|
+
const sentinelPath = `${lockPath}${RECOVERY_SUFFIX}`;
|
|
144
|
+
const sentinel = acquirePrimitiveLock(sentinelPath, options);
|
|
145
|
+
try {
|
|
146
|
+
return operation();
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
releaseOwnedLock(sentinelPath, sentinel, 'file-lock.releaseRecovery');
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
function acquireLock(lockPath, options) {
|
|
153
|
+
const deadline = Date.now() + options.waitMs;
|
|
154
|
+
while (true) {
|
|
155
|
+
const remainingMs = Math.max(0, deadline - Date.now());
|
|
156
|
+
let owner = null;
|
|
157
|
+
withRecoverySentinel(lockPath, { ...options, waitMs: remainingMs }, () => {
|
|
158
|
+
owner = createLock(lockPath);
|
|
159
|
+
if (!owner && recoverStaleLock(lockPath, options.staleMs)) {
|
|
160
|
+
owner = createLock(lockPath);
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
if (owner)
|
|
164
|
+
return owner;
|
|
165
|
+
if (Date.now() >= deadline)
|
|
166
|
+
throw new Error(`Timed out waiting for file lock ${lockPath}`);
|
|
167
|
+
sleepSync(options.retryMs);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
114
170
|
/** Serialize a synchronous read-modify-write operation across Orion processes. */
|
|
115
171
|
function withFileLockSync(targetPath, operation, options = {}) {
|
|
116
172
|
const lockPath = `${targetPath}.lock`;
|
|
117
|
-
const
|
|
173
|
+
const resolvedOptions = {
|
|
118
174
|
waitMs: options.waitMs ?? DEFAULT_WAIT_MS,
|
|
119
175
|
retryMs: options.retryMs ?? DEFAULT_RETRY_MS,
|
|
120
176
|
staleMs: options.staleMs ?? DEFAULT_STALE_MS,
|
|
121
|
-
}
|
|
177
|
+
};
|
|
178
|
+
const owner = acquireLock(lockPath, resolvedOptions);
|
|
122
179
|
try {
|
|
123
180
|
return operation();
|
|
124
181
|
}
|
|
125
182
|
finally {
|
|
126
183
|
try {
|
|
127
|
-
|
|
128
|
-
(
|
|
129
|
-
}
|
|
130
|
-
else {
|
|
131
|
-
(0, debug_log_1.debugError)('file-lock.releaseOwnership', new Error('lock ownership changed'), lockPath);
|
|
132
|
-
}
|
|
184
|
+
withRecoverySentinel(lockPath, resolvedOptions, () => {
|
|
185
|
+
releaseOwnedLock(lockPath, owner, 'file-lock.release');
|
|
186
|
+
});
|
|
133
187
|
}
|
|
134
188
|
catch (error) {
|
|
135
189
|
(0, debug_log_1.debugError)('file-lock.release', error, lockPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/services/file-lock.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/services/file-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Environment variable overrides use ORION_CODE_ prefix.
|
|
6
6
|
*/
|
|
7
7
|
import type { ModelPricing } from '../core/cost-tracker';
|
|
8
|
+
import { type EffortPreference } from './effort';
|
|
8
9
|
/** 项目级配置 */
|
|
9
10
|
export interface ProjectConfig {
|
|
10
11
|
/** 允许的工具列表 */
|
|
@@ -20,6 +21,8 @@ export interface ProjectConfig {
|
|
|
20
21
|
lastModel?: string;
|
|
21
22
|
/** 是否已接受信任对话框 */
|
|
22
23
|
hasTrustDialogAccepted?: boolean;
|
|
24
|
+
/** Project default reasoning effort. */
|
|
25
|
+
defaultEffort?: EffortPreference;
|
|
23
26
|
}
|
|
24
27
|
/** How to handle tool permission checks that request interactive confirmation. */
|
|
25
28
|
export type ToolConfirmationPolicy = 'ask' | 'allow' | 'deny';
|
|
@@ -143,6 +146,10 @@ export interface GlobalConfig {
|
|
|
143
146
|
fallbackModel?: string;
|
|
144
147
|
/** Tool confirmation fallback while the current CLI cannot show prompts. */
|
|
145
148
|
toolConfirmation?: ToolConfirmationPolicy;
|
|
149
|
+
/** Machine-wide tool permission rules applied to every project. */
|
|
150
|
+
allowedTools?: string[];
|
|
151
|
+
/** Global default reasoning effort. */
|
|
152
|
+
defaultEffort?: EffortPreference;
|
|
146
153
|
/** WebSearch MCP configuration. */
|
|
147
154
|
webSearch?: WebSearchMcpConfig;
|
|
148
155
|
/** Terminal UI configuration. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/services/global-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/services/global-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ const crypto_1 = require("crypto");
|
|
|
22
22
|
const path_1 = require("path");
|
|
23
23
|
const config_dir_1 = require("./config-dir");
|
|
24
24
|
const atomic_write_1 = require("./atomic-write");
|
|
25
|
+
const effort_1 = require("./effort");
|
|
25
26
|
// ============================================================================
|
|
26
27
|
// 默认配置
|
|
27
28
|
// ============================================================================
|
|
@@ -73,6 +74,8 @@ function sanitizeProjectConfig(value) {
|
|
|
73
74
|
if (typeof raw.hasTrustDialogAccepted === 'boolean') {
|
|
74
75
|
sanitized.hasTrustDialogAccepted = raw.hasTrustDialogAccepted;
|
|
75
76
|
}
|
|
77
|
+
if ((0, effort_1.isEffortPreference)(raw.defaultEffort))
|
|
78
|
+
sanitized.defaultEffort = raw.defaultEffort;
|
|
76
79
|
return sanitized;
|
|
77
80
|
}
|
|
78
81
|
function sanitizeGlobalConfig(config) {
|
|
@@ -81,6 +84,15 @@ function sanitizeGlobalConfig(config) {
|
|
|
81
84
|
void _totalTokens;
|
|
82
85
|
void _totalCost;
|
|
83
86
|
const sanitized = { ...rest, schemaVersion: CONFIG_SCHEMA_VERSION };
|
|
87
|
+
if (Array.isArray(rest.allowedTools) &&
|
|
88
|
+
rest.allowedTools.every(item => typeof item === 'string')) {
|
|
89
|
+
sanitized.allowedTools = [...new Set(rest.allowedTools)];
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
delete sanitized.allowedTools;
|
|
93
|
+
}
|
|
94
|
+
if (!(0, effort_1.isEffortPreference)(rest.defaultEffort))
|
|
95
|
+
delete sanitized.defaultEffort;
|
|
84
96
|
const sandbox = sanitizeSandboxConfig(rest.sandbox);
|
|
85
97
|
if (sandbox)
|
|
86
98
|
sanitized.sandbox = sandbox;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../../src/services/global-config.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../../src/services/global-config.ts"],"names":[],"mappings":"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"}
|
package/dist/services/llm.d.ts
CHANGED
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import type { ProviderErrorType } from './provider-diagnostics';
|
|
10
10
|
import { type ProviderRequestDiagnosticsV2 } from './provider-resilience';
|
|
11
|
+
import { type EffortPreference, type ReasoningCapability, type ResolvedEffort } from './effort';
|
|
12
|
+
import type { ProviderProtocol } from './model-registry';
|
|
11
13
|
export { LLMProviderError } from './provider-diagnostics';
|
|
12
14
|
export type { ProviderErrorDiagnostic, ProviderErrorType } from './provider-diagnostics';
|
|
13
15
|
/** LLM 配置 — 用户只需关注 3 项 */
|
|
@@ -22,6 +24,10 @@ export interface LLMConfig {
|
|
|
22
24
|
fallbackModel?: string;
|
|
23
25
|
/** 请求超时 (ms) */
|
|
24
26
|
timeout?: number;
|
|
27
|
+
providerProtocol?: ProviderProtocol;
|
|
28
|
+
reasoningCapability?: ReasoningCapability;
|
|
29
|
+
fallbackReasoningCapability?: ReasoningCapability;
|
|
30
|
+
effortPreference?: EffortPreference;
|
|
25
31
|
}
|
|
26
32
|
/** 重试配置 */
|
|
27
33
|
export interface RetryConfig {
|
|
@@ -108,6 +114,12 @@ export interface LLMUsage {
|
|
|
108
114
|
costUsd?: number;
|
|
109
115
|
/** Provider request id, or a locally generated id when omitted. */
|
|
110
116
|
requestId?: string;
|
|
117
|
+
/** Provider-reported reasoning tokens; already included in completionTokens. */
|
|
118
|
+
reasoningTokens?: number;
|
|
119
|
+
effortRequested?: EffortPreference;
|
|
120
|
+
effortEffective?: import('./effort').EffortLevel;
|
|
121
|
+
effortSource?: ResolvedEffort['source'];
|
|
122
|
+
providerProtocol?: ProviderProtocol;
|
|
111
123
|
}
|
|
112
124
|
export interface LLMUsageEvent {
|
|
113
125
|
usage: LLMUsage;
|
|
@@ -171,6 +183,7 @@ export declare class LLMService {
|
|
|
171
183
|
private lastRequestDiagnostics;
|
|
172
184
|
private usageObservers;
|
|
173
185
|
private providerRequestPreflight?;
|
|
186
|
+
private effortContext;
|
|
174
187
|
/** v0.2.25: injected resilience coordinator (optional — falls back to old withRetry if absent). */
|
|
175
188
|
resilience?: import('./provider-resilience').ProviderResilienceCoordinator;
|
|
176
189
|
constructor(config: LLMConfig);
|
|
@@ -203,6 +216,13 @@ export declare class LLMService {
|
|
|
203
216
|
* 切换模型
|
|
204
217
|
*/
|
|
205
218
|
setModel(model: string): void;
|
|
219
|
+
setEffortContext(input: {
|
|
220
|
+
preference: EffortPreference;
|
|
221
|
+
protocol: ProviderProtocol;
|
|
222
|
+
capability?: ReasoningCapability;
|
|
223
|
+
fallbackCapability?: ReasoningCapability;
|
|
224
|
+
}): ResolvedEffort;
|
|
225
|
+
getResolvedEffort(): ResolvedEffort;
|
|
206
226
|
/**
|
|
207
227
|
* 获取当前模型
|
|
208
228
|
*/
|
|
@@ -213,6 +233,9 @@ export declare class LLMService {
|
|
|
213
233
|
* 获取当前配置摘要
|
|
214
234
|
*/
|
|
215
235
|
getConfigSummary(): Record<string, string>;
|
|
236
|
+
private createEffortRequestSnapshot;
|
|
237
|
+
private effortSnapshotForModel;
|
|
238
|
+
private annotateEffortUsage;
|
|
216
239
|
private createRequestDiagnostics;
|
|
217
240
|
private applyResilienceDiagnostics;
|
|
218
241
|
/** 转换为 OpenAI SDK 消息格式 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/services/llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAML,KAAK,4BAA4B,EAClC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/services/llm.ts"],"names":[],"mappings":"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"}
|