@dirgha/code 1.34.1 → 1.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -120,13 +120,52 @@ export interface ToolCall {
120
120
  name: string;
121
121
  input: unknown;
122
122
  }
123
- export interface ToolResult<T = unknown> {
123
+ /**
124
+ * Typed error information for tool failures. Used by the agent loop
125
+ * to decide retry/abort/fallback behaviour.
126
+ */
127
+ export type ToolErrorKind = 'refusal' | 'timeout' | 'permission' | 'malformed_input' | 'tool_not_found' | 'aborted' | 'rate_limit' | 'network' | 'internal' | 'external';
128
+ export interface ToolError {
129
+ kind: ToolErrorKind;
130
+ message: string;
131
+ retryable: boolean;
132
+ fatal_to_loop: boolean;
133
+ cause?: unknown;
134
+ }
135
+ /**
136
+ * Discriminant union for tool results. The `ok` field is the discriminant.
137
+ * `content` is always present (human-readable string for the provider's
138
+ * tool_result message). `isError` is a derived alias of `!ok` for legacy
139
+ * consumers; new code should use `ok` instead.
140
+ */
141
+ type ToolResultBase = {
124
142
  content: string;
125
- data?: T;
126
- isError: boolean;
127
143
  metadata?: Record<string, unknown>;
128
144
  durationMs?: number;
129
- }
145
+ };
146
+ export type ToolResult<T = unknown> = (ToolResultBase & {
147
+ isError: false;
148
+ ok?: true;
149
+ value?: T;
150
+ data?: T;
151
+ }) | (ToolResultBase & {
152
+ isError: true;
153
+ ok?: false;
154
+ error?: ToolError;
155
+ data?: unknown;
156
+ });
157
+ /**
158
+ * Type guard: narrows ToolResult to its error branch.
159
+ */
160
+ export declare function isToolError<T>(r: ToolResult<T>): r is Extract<ToolResult<T>, {
161
+ isError: true;
162
+ }>;
163
+ /**
164
+ * Type guard: narrows ToolResult to its success branch.
165
+ */
166
+ export declare function isToolOk<T>(r: ToolResult<T>): r is Extract<ToolResult<T>, {
167
+ isError: false;
168
+ }>;
130
169
  export interface ToolDefinition {
131
170
  name: string;
132
171
  description: string;
@@ -211,3 +250,4 @@ export interface AgentResult {
211
250
  turnCount: number;
212
251
  sessionId: string;
213
252
  }
253
+ export {};
@@ -5,5 +5,16 @@
5
5
  * tools consume tool-use parts and emit tool-result parts, surfaces render
6
6
  * events, the daemon streams events over RPC. One shape, everywhere.
7
7
  */
8
- export {};
8
+ /**
9
+ * Type guard: narrows ToolResult to its error branch.
10
+ */
11
+ export function isToolError(r) {
12
+ return r.isError === true;
13
+ }
14
+ /**
15
+ * Type guard: narrows ToolResult to its success branch.
16
+ */
17
+ export function isToolOk(r) {
18
+ return r.isError === false;
19
+ }
9
20
  //# sourceMappingURL=types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/kernel/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/kernel/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAmKH;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,CAAgB;IAEhB,OAAO,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CACtB,CAAgB;IAEhB,OAAO,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;AAC7B,CAAC"}
@@ -10,6 +10,19 @@
10
10
  * progress push events back through the agent-loop event stream.
11
11
  */
12
12
  import { selectSandbox } from "../safety/sandbox/select.js";
13
+ import { wrapLegacyResult, internalError } from './result-wrappers.js';
14
+ function toolError(kind, message, opts = {}) {
15
+ const r = internalError(kind, message);
16
+ if (opts.durationMs !== undefined)
17
+ r.durationMs = opts.durationMs;
18
+ if (r.isError === true && r.error) {
19
+ if (opts.fatal_to_loop !== undefined)
20
+ r.error.fatal_to_loop = opts.fatal_to_loop;
21
+ if (opts.cause !== undefined)
22
+ r.error.cause = opts.cause;
23
+ }
24
+ return r;
25
+ }
13
26
  export function createToolExecutor(opts) {
14
27
  const env = opts.env ?? sanitiseEnv(process.env);
15
28
  // Resolve the platform sandbox adapter once per executor instance.
@@ -35,10 +48,7 @@ export function createToolExecutor(opts) {
35
48
  if (!tool) {
36
49
  const available = opts.registry.list().map((t) => t.name);
37
50
  const suggestions = closestMatches(call.name, available, 3);
38
- return {
39
- content: `Tool "${call.name}" is not registered. ${available.length} tools available. ${suggestions.length > 0 ? 'Did you mean: ' + suggestions.join(', ') + '?' : 'Use the tool registry list to see what is callable.'}`,
40
- isError: true,
41
- };
51
+ return toolError('tool_not_found', `Tool "${call.name}" is not registered. ${available.length} tools available. ${suggestions.length > 0 ? 'Did you mean: ' + suggestions.join(', ') + '?' : 'Use the tool registry list to see what is callable.'}`);
42
52
  }
43
53
  if (opts.permission) {
44
54
  const decision = opts.permission.check({
@@ -47,10 +57,7 @@ export function createToolExecutor(opts) {
47
57
  target: opts.cwd,
48
58
  });
49
59
  if (!decision.allowed) {
50
- return {
51
- content: `Permission denied: ${decision.reason}`,
52
- isError: true,
53
- };
60
+ return toolError('permission', `Permission denied: ${decision.reason}`);
54
61
  }
55
62
  }
56
63
  const sandbox = await sandboxPromise;
@@ -72,7 +79,7 @@ export function createToolExecutor(opts) {
72
79
  }
73
80
  catch (err) {
74
81
  const msg = err instanceof Error ? err.message : String(err);
75
- return { content: `Tool "${call.name}" failed: ${msg}`, isError: true };
82
+ return toolError('internal', `Tool "${call.name}" failed: ${msg}`, { cause: err });
76
83
  }
77
84
  },
78
85
  };
@@ -90,18 +97,11 @@ async function runTool(tool, input, ctx) {
90
97
  const abortPromise = ctx.signal
91
98
  ? new Promise((resolve) => {
92
99
  if (ctx.signal.aborted) {
93
- resolve({
94
- content: `Tool "${tool.name}" aborted before start.`,
95
- isError: true,
96
- });
100
+ resolve(toolError('aborted', `Tool "${tool.name}" aborted before start.`));
97
101
  return;
98
102
  }
99
103
  ctx.signal.addEventListener("abort", () => {
100
- resolve({
101
- content: `Tool "${tool.name}" aborted by user (signal).`,
102
- isError: true,
103
- durationMs: Date.now() - started,
104
- });
104
+ resolve(toolError('aborted', `Tool "${tool.name}" aborted by user (signal).`, { durationMs: Date.now() - started }));
105
105
  }, { once: true });
106
106
  })
107
107
  : new Promise(() => {
@@ -114,11 +114,7 @@ async function runTool(tool, input, ctx) {
114
114
  abortPromise,
115
115
  new Promise((resolve) => {
116
116
  const timer = setTimeout(() => {
117
- resolve({
118
- content: `Tool "${tool.name}" timed out after ${deadlineMs}ms.`,
119
- isError: true,
120
- durationMs: deadlineMs,
121
- });
117
+ resolve(toolError('timeout', `Tool "${tool.name}" timed out after ${deadlineMs}ms.`, { durationMs: deadlineMs }));
122
118
  }, deadlineMs);
123
119
  ctx.signal?.addEventListener("abort", () => clearTimeout(timer), {
124
120
  once: true,
@@ -129,8 +125,13 @@ async function runTool(tool, input, ctx) {
129
125
  else {
130
126
  result = await Promise.race([tool.execute(input, ctx), abortPromise]);
131
127
  }
132
- result.durationMs = result.durationMs ?? Date.now() - started;
133
- return result;
128
+ const finalDuration = result.durationMs ?? Date.now() - started;
129
+ // Canonicalise: every result reaches the agent loop as a v2 ToolResult
130
+ // with `ok` field set, regardless of which shape the tool returned.
131
+ const wrapped = wrapLegacyResult(result, 'external');
132
+ if (wrapped.durationMs === undefined)
133
+ wrapped.durationMs = finalDuration;
134
+ return wrapped;
134
135
  }
135
136
  function sanitiseEnv(source) {
136
137
  const out = {};
@@ -1 +1 @@
1
- {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,20 @@
1
+ /**
2
+ * Helpers to convert legacy v1 tool results to the v2 ToolResult union.
3
+ * v1 shape: { content, isError, data?, metadata?, durationMs? }
4
+ * v2 shape: { ok, value | error, content, isError, metadata?, durationMs? }
5
+ *
6
+ * After wrapping, isError is computed as `!ok` so legacy consumers keep
7
+ * working.
8
+ */
9
+ import type { ToolResult, ToolErrorKind } from '../kernel/types.js';
10
+ export declare function wrapLegacyResult<T = unknown>(raw: unknown, fallbackErrorKind?: ToolErrorKind): ToolResult<T>;
11
+ export declare function looksLikeV2Result(raw: unknown): boolean;
12
+ export declare function internalError<T = unknown>(kind: ToolErrorKind, message: string, content?: string, opts?: {
13
+ retryable?: boolean;
14
+ fatal_to_loop?: boolean;
15
+ cause?: unknown;
16
+ }): ToolResult<T>;
17
+ export declare function okResult<T = unknown>(content: string, value?: T, opts?: {
18
+ metadata?: Record<string, unknown>;
19
+ durationMs?: number;
20
+ }): ToolResult<T>;
@@ -0,0 +1,115 @@
1
+ /**
2
+ * Helpers to convert legacy v1 tool results to the v2 ToolResult union.
3
+ * v1 shape: { content, isError, data?, metadata?, durationMs? }
4
+ * v2 shape: { ok, value | error, content, isError, metadata?, durationMs? }
5
+ *
6
+ * After wrapping, isError is computed as `!ok` so legacy consumers keep
7
+ * working.
8
+ */
9
+ function buildOk(content, value, opts = {}) {
10
+ const out = {
11
+ ok: true,
12
+ isError: false,
13
+ content,
14
+ value,
15
+ };
16
+ if (opts.metadata !== undefined)
17
+ out.metadata = opts.metadata;
18
+ if (opts.durationMs !== undefined)
19
+ out.durationMs = opts.durationMs;
20
+ return out;
21
+ }
22
+ function buildError(content, error, opts = {}) {
23
+ const out = {
24
+ ok: false,
25
+ isError: true,
26
+ content,
27
+ error,
28
+ };
29
+ if (opts.metadata !== undefined)
30
+ out.metadata = opts.metadata;
31
+ if (opts.durationMs !== undefined)
32
+ out.durationMs = opts.durationMs;
33
+ if (opts.data !== undefined)
34
+ out.data = opts.data;
35
+ return out;
36
+ }
37
+ export function wrapLegacyResult(raw, fallbackErrorKind = 'external') {
38
+ // null / undefined
39
+ if (raw === null || raw === undefined) {
40
+ return buildError('', {
41
+ kind: 'internal',
42
+ message: 'tool returned null or undefined',
43
+ retryable: false,
44
+ fatal_to_loop: false,
45
+ });
46
+ }
47
+ // bare string
48
+ if (typeof raw === 'string') {
49
+ return buildOk(raw, undefined);
50
+ }
51
+ if (typeof raw !== 'object') {
52
+ return buildError(String(raw), {
53
+ kind: 'internal',
54
+ message: `tool returned non-object: ${typeof raw}`,
55
+ retryable: false,
56
+ fatal_to_loop: false,
57
+ });
58
+ }
59
+ const obj = raw;
60
+ const content = typeof obj.content === 'string' ? obj.content : '';
61
+ const metadata = (obj.metadata && typeof obj.metadata === 'object')
62
+ ? obj.metadata
63
+ : undefined;
64
+ const durationMs = typeof obj.durationMs === 'number' ? obj.durationMs : undefined;
65
+ // already-v2 shape: pass through, but normalise isError = !ok.
66
+ if ('ok' in obj && typeof obj.ok === 'boolean') {
67
+ if (obj.ok) {
68
+ return buildOk(content, (obj.value ?? undefined), { metadata, durationMs });
69
+ }
70
+ else {
71
+ const errObj = obj.error ?? undefined;
72
+ const error = {
73
+ kind: (errObj?.kind ?? fallbackErrorKind),
74
+ message: errObj?.message ?? content ?? 'unknown error',
75
+ retryable: errObj?.retryable ?? false,
76
+ fatal_to_loop: errObj?.fatal_to_loop ?? false,
77
+ };
78
+ if (errObj?.cause !== undefined)
79
+ error.cause = errObj.cause;
80
+ return buildError(content, error, { metadata, durationMs, data: obj.data });
81
+ }
82
+ }
83
+ // Legacy v1 shape: { content, isError, data?, metadata?, durationMs? }
84
+ const isError = obj.isError === true;
85
+ if (isError) {
86
+ return buildError(content, {
87
+ kind: fallbackErrorKind,
88
+ message: content || 'unknown error',
89
+ retryable: false,
90
+ fatal_to_loop: false,
91
+ }, { metadata, durationMs, data: obj.data });
92
+ }
93
+ return buildOk(content, (obj.data ?? undefined), { metadata, durationMs });
94
+ }
95
+ export function looksLikeV2Result(raw) {
96
+ return (typeof raw === 'object' &&
97
+ raw !== null &&
98
+ 'ok' in raw &&
99
+ typeof raw.ok === 'boolean');
100
+ }
101
+ export function internalError(kind, message, content = message, opts = {}) {
102
+ const error = {
103
+ kind,
104
+ message,
105
+ retryable: opts.retryable ?? false,
106
+ fatal_to_loop: opts.fatal_to_loop ?? false,
107
+ };
108
+ if (opts.cause !== undefined)
109
+ error.cause = opts.cause;
110
+ return buildError(content, error);
111
+ }
112
+ export function okResult(content, value = undefined, opts = {}) {
113
+ return buildOk(content, value, opts);
114
+ }
115
+ //# sourceMappingURL=result-wrappers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"result-wrappers.js","sourceRoot":"","sources":["../../src/tools/result-wrappers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dirgha/code",
3
- "version": "1.34.1",
3
+ "version": "1.35.0",
4
4
  "description": "CLI coding agent for complex agentic workflows and long-horizon development. Local models (llama.cpp / Ollama), BYOK across 17 providers, parallel agents, persistent memory, scanned skills.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",