atom-lite 0.5.1 → 0.6.3

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.
Files changed (105) hide show
  1. package/CHANGELOG.md +33 -1
  2. package/README.md +60 -116
  3. package/dist/agent/loop.d.ts +16 -0
  4. package/dist/agent/loop.js +158 -11
  5. package/dist/agent/loop.js.map +1 -1
  6. package/dist/agent/system-prompt.d.ts +1 -0
  7. package/dist/agent/system-prompt.js +23 -0
  8. package/dist/agent/system-prompt.js.map +1 -0
  9. package/dist/agent/turn-recorder.d.ts +4 -0
  10. package/dist/agent/turn-recorder.js +1 -0
  11. package/dist/agent/turn-recorder.js.map +1 -1
  12. package/dist/agent/types.d.ts +33 -0
  13. package/dist/cli/app.js +337 -55
  14. package/dist/cli/app.js.map +1 -1
  15. package/dist/cli/commands.js +180 -0
  16. package/dist/cli/commands.js.map +1 -1
  17. package/dist/cli/diff-view.d.ts +18 -0
  18. package/dist/cli/diff-view.js +66 -0
  19. package/dist/cli/diff-view.js.map +1 -0
  20. package/dist/cli/main.js +2 -1
  21. package/dist/cli/main.js.map +1 -1
  22. package/dist/cli/panel.js +8 -8
  23. package/dist/cli/panel.js.map +1 -1
  24. package/dist/cli/status-line.d.ts +2 -0
  25. package/dist/cli/status-line.js +9 -1
  26. package/dist/cli/status-line.js.map +1 -1
  27. package/dist/cli/tool-box.d.ts +1 -1
  28. package/dist/cli/tool-box.js +47 -41
  29. package/dist/cli/tool-box.js.map +1 -1
  30. package/dist/config/defaults.d.ts +4 -5
  31. package/dist/config/defaults.js +6 -3
  32. package/dist/config/defaults.js.map +1 -1
  33. package/dist/config/load.js +29 -3
  34. package/dist/config/load.js.map +1 -1
  35. package/dist/config/schema.d.ts +14 -14
  36. package/dist/config/schema.js +8 -5
  37. package/dist/config/schema.js.map +1 -1
  38. package/dist/context/budget.js +19 -1
  39. package/dist/context/budget.js.map +1 -1
  40. package/dist/context/manager.js +1 -1
  41. package/dist/context/manager.js.map +1 -1
  42. package/dist/eval/runner.d.ts +51 -0
  43. package/dist/eval/runner.js +230 -0
  44. package/dist/eval/runner.js.map +1 -0
  45. package/dist/mcp/client.js +2 -1
  46. package/dist/mcp/client.js.map +1 -1
  47. package/dist/providers/context-window.d.ts +4 -0
  48. package/dist/providers/context-window.js +54 -0
  49. package/dist/providers/context-window.js.map +1 -1
  50. package/dist/providers/factory.js +3 -0
  51. package/dist/providers/factory.js.map +1 -1
  52. package/dist/providers/gemini.d.ts +2 -0
  53. package/dist/providers/gemini.js +18 -11
  54. package/dist/providers/gemini.js.map +1 -1
  55. package/dist/providers/ollama.d.ts +3 -0
  56. package/dist/providers/ollama.js +9 -0
  57. package/dist/providers/ollama.js.map +1 -1
  58. package/dist/providers/openai-compatible.d.ts +2 -0
  59. package/dist/providers/openai-compatible.js +24 -3
  60. package/dist/providers/openai-compatible.js.map +1 -1
  61. package/dist/runtime/background-tasks.d.ts +23 -0
  62. package/dist/runtime/background-tasks.js +141 -0
  63. package/dist/runtime/background-tasks.js.map +1 -0
  64. package/dist/runtime/checkpoint-store.d.ts +64 -0
  65. package/dist/runtime/checkpoint-store.js +419 -0
  66. package/dist/runtime/checkpoint-store.js.map +1 -0
  67. package/dist/runtime/modes.d.ts +3 -0
  68. package/dist/runtime/modes.js +8 -0
  69. package/dist/runtime/modes.js.map +1 -0
  70. package/dist/runtime/tool-executor.js +10 -0
  71. package/dist/runtime/tool-executor.js.map +1 -1
  72. package/dist/skills/registry.js +8 -1
  73. package/dist/skills/registry.js.map +1 -1
  74. package/dist/tools/bash.js +46 -10
  75. package/dist/tools/bash.js.map +1 -1
  76. package/dist/tools/edit.js +28 -8
  77. package/dist/tools/edit.js.map +1 -1
  78. package/dist/tools/glob.d.ts +2 -0
  79. package/dist/tools/glob.js +97 -0
  80. package/dist/tools/glob.js.map +1 -0
  81. package/dist/tools/grep.d.ts +2 -0
  82. package/dist/tools/grep.js +290 -0
  83. package/dist/tools/grep.js.map +1 -0
  84. package/dist/tools/index.d.ts +3 -0
  85. package/dist/tools/index.js +3 -0
  86. package/dist/tools/index.js.map +1 -1
  87. package/dist/tools/read.js +70 -9
  88. package/dist/tools/read.js.map +1 -1
  89. package/dist/tools/task.d.ts +2 -0
  90. package/dist/tools/task.js +55 -0
  91. package/dist/tools/task.js.map +1 -0
  92. package/dist/tools/types.d.ts +10 -1
  93. package/dist/tools/write.js +29 -8
  94. package/dist/tools/write.js.map +1 -1
  95. package/dist/types.d.ts +9 -3
  96. package/dist/types.js +1 -4
  97. package/dist/types.js.map +1 -1
  98. package/dist/version.d.ts +1 -0
  99. package/dist/version.js +14 -0
  100. package/dist/version.js.map +1 -0
  101. package/package.json +5 -3
  102. package/skills/atom-lite-extensions/SKILL.md +240 -0
  103. package/skills/caveman/SKILL.md +89 -0
  104. package/skills/code-review/SKILL.md +46 -0
  105. package/skills/optimization/SKILL.md +51 -0
@@ -0,0 +1,419 @@
1
+ import { execFileSync } from "node:child_process";
2
+ import { copyFileSync, chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, readlinkSync, rmSync, statSync, lstatSync, writeFileSync, } from "node:fs";
3
+ import { createHash } from "node:crypto";
4
+ import { join } from "node:path";
5
+ import { userConfigDir } from "../config/paths.js";
6
+ const DEFAULT_MAX_BYTES = 50 * 1024 * 1024;
7
+ const DEFAULT_MAX_COUNT = 20;
8
+ export class CheckpointStore {
9
+ workspace;
10
+ sessionId;
11
+ maxBytes;
12
+ maxCount;
13
+ enabled;
14
+ sequence = 0;
15
+ constructor(workspace, sessionId, options = {}) {
16
+ this.workspace = workspace;
17
+ this.sessionId = sessionId;
18
+ this.maxBytes = options.maxCheckpointBytes ?? DEFAULT_MAX_BYTES;
19
+ this.maxCount = options.maxCheckpoints ?? DEFAULT_MAX_COUNT;
20
+ this.enabled = options.enabled ?? true;
21
+ try {
22
+ const seqs = this.list().map((m) => m.sequence ?? 0);
23
+ this.sequence = seqs.length ? Math.max(...seqs) : 0;
24
+ }
25
+ catch {
26
+ this.sequence = 0;
27
+ }
28
+ }
29
+ workspaceHash() {
30
+ return createHash("sha256").update(this.workspace).digest("hex").slice(0, 16);
31
+ }
32
+ storageRoot() {
33
+ return join(userConfigDir(), "checkpoints", this.workspaceHash(), this.sessionId);
34
+ }
35
+ checkpointDir(id) {
36
+ return join(this.storageRoot(), id);
37
+ }
38
+ filesDir(id) {
39
+ return join(this.checkpointDir(id), "files");
40
+ }
41
+ manifestPath(id) {
42
+ return join(this.checkpointDir(id), "manifest.json");
43
+ }
44
+ isAvailable() {
45
+ if (!this.enabled)
46
+ return { available: false, reason: "checkpointing disabled" };
47
+ try {
48
+ const out = execFileSync("git", ["rev-parse", "--is-inside-work-tree"], {
49
+ cwd: this.workspace,
50
+ stdio: ["ignore", "pipe", "ignore"],
51
+ })
52
+ .toString("utf8")
53
+ .trim();
54
+ if (out === "true")
55
+ return { available: true };
56
+ return { available: false, reason: "not a git worktree" };
57
+ }
58
+ catch {
59
+ return { available: false, reason: "not a git repository" };
60
+ }
61
+ }
62
+ runGit(args) {
63
+ return execFileSync("git", args, {
64
+ cwd: this.workspace,
65
+ stdio: ["ignore", "pipe", "ignore"],
66
+ }).toString("utf8");
67
+ }
68
+ listWorkspaceFiles() {
69
+ let tracked = [];
70
+ let untracked = [];
71
+ try {
72
+ tracked = this.runGit(["ls-files", "-z"])
73
+ .split("\0")
74
+ .filter(Boolean);
75
+ }
76
+ catch {
77
+ tracked = [];
78
+ }
79
+ try {
80
+ untracked = this.runGit(["ls-files", "--others", "--exclude-standard", "-z"])
81
+ .split("\0")
82
+ .filter(Boolean);
83
+ }
84
+ catch {
85
+ untracked = [];
86
+ }
87
+ return [...new Set([...tracked, ...untracked])].sort();
88
+ }
89
+ isSymlink(rel) {
90
+ try {
91
+ return lstatSync(join(this.workspace, rel)).isSymbolicLink();
92
+ }
93
+ catch {
94
+ return false;
95
+ }
96
+ }
97
+ isSubmodule(rel) {
98
+ try {
99
+ const full = join(this.workspace, rel);
100
+ if (!statSync(full).isDirectory())
101
+ return false;
102
+ return existsSync(join(full, ".git"));
103
+ }
104
+ catch {
105
+ return false;
106
+ }
107
+ }
108
+ list() {
109
+ const root = this.storageRoot();
110
+ if (!existsSync(root))
111
+ return [];
112
+ const out = [];
113
+ for (const name of readdirSync(root)) {
114
+ const mp = join(root, name, "manifest.json");
115
+ if (!existsSync(mp))
116
+ continue;
117
+ try {
118
+ const m = JSON.parse(readFileSync(mp, "utf8"));
119
+ out.push(m);
120
+ }
121
+ catch {
122
+ // skip corrupt
123
+ }
124
+ }
125
+ out.sort((a, b) => b.createdAt - a.createdAt || b.sequence - a.sequence);
126
+ return out;
127
+ }
128
+ get(id) {
129
+ const mp = this.manifestPath(id);
130
+ if (!existsSync(mp))
131
+ return undefined;
132
+ try {
133
+ return JSON.parse(readFileSync(mp, "utf8"));
134
+ }
135
+ catch {
136
+ return undefined;
137
+ }
138
+ }
139
+ create(turn, label) {
140
+ const avail = this.isAvailable();
141
+ if (!avail.available)
142
+ throw new Error(avail.reason ?? "checkpoint unavailable");
143
+ // prune by count
144
+ const existing = this.list();
145
+ if (existing.length >= this.maxCount) {
146
+ const toRemove = existing.slice(this.maxCount - 1);
147
+ for (const m of toRemove) {
148
+ rmSync(this.checkpointDir(m.id), { recursive: true, force: true });
149
+ }
150
+ }
151
+ this.sequence += 1;
152
+ const id = `${this.sessionId}-${turn}-${this.sequence}`;
153
+ try {
154
+ mkdirSync(this.storageRoot(), { recursive: true, mode: 0o700 });
155
+ chmodSync(this.storageRoot(), 0o700);
156
+ }
157
+ catch {
158
+ // best effort
159
+ }
160
+ const dir = this.checkpointDir(id);
161
+ const filesDir = this.filesDir(id);
162
+ mkdirSync(filesDir, { recursive: true, mode: 0o700 });
163
+ try {
164
+ chmodSync(dir, 0o700);
165
+ }
166
+ catch { /* best effort */ }
167
+ const skipped = [];
168
+ const captured = [];
169
+ let bytes = 0;
170
+ let tooLarge = false;
171
+ const files = this.listWorkspaceFiles();
172
+ // first pass: compute sizes
173
+ const toCopy = [];
174
+ for (const rel of files) {
175
+ const full = join(this.workspace, rel);
176
+ if (this.isSymlink(rel)) {
177
+ let target;
178
+ try {
179
+ target = readlinkSync(join(this.workspace, rel));
180
+ }
181
+ catch {
182
+ target = undefined;
183
+ }
184
+ skipped.push({ path: rel, reason: "symlink", target });
185
+ continue;
186
+ }
187
+ if (this.isSubmodule(rel)) {
188
+ skipped.push({ path: rel, reason: "submodule" });
189
+ continue;
190
+ }
191
+ let st;
192
+ try {
193
+ st = statSync(full);
194
+ }
195
+ catch {
196
+ skipped.push({ path: rel, reason: "deleted" });
197
+ continue;
198
+ }
199
+ if (!st.isFile()) {
200
+ skipped.push({ path: rel, reason: "not a regular file" });
201
+ continue;
202
+ }
203
+ if (bytes + st.size > this.maxBytes) {
204
+ tooLarge = true;
205
+ break;
206
+ }
207
+ bytes += st.size;
208
+ toCopy.push({ rel, size: st.size });
209
+ }
210
+ if (tooLarge) {
211
+ rmSync(dir, { recursive: true, force: true });
212
+ throw new Error("CHECKPOINT_TOO_LARGE");
213
+ }
214
+ for (const { rel } of toCopy) {
215
+ const src = join(this.workspace, rel);
216
+ const dst = join(filesDir, rel);
217
+ mkdirSync(join(dst, ".."), { recursive: true });
218
+ copyFileSync(src, dst);
219
+ captured.push(rel);
220
+ }
221
+ const manifest = {
222
+ id,
223
+ sessionId: this.sessionId,
224
+ turn,
225
+ sequence: this.sequence,
226
+ createdAt: Date.now(),
227
+ label,
228
+ files: captured,
229
+ skipped,
230
+ bytes,
231
+ empty: captured.length === 0 && skipped.length === 0,
232
+ };
233
+ writeFileSync(this.manifestPath(id), JSON.stringify(manifest, null, 2), { mode: 0o600 });
234
+ // ensure storage root perms
235
+ try {
236
+ mkdirSync(this.storageRoot(), { recursive: true, mode: 0o700 });
237
+ }
238
+ catch {
239
+ // ignore
240
+ }
241
+ return manifest;
242
+ }
243
+ isAtCheckpoint(id) {
244
+ const m = this.get(id);
245
+ if (!m)
246
+ return false;
247
+ const current = this.listWorkspaceFiles();
248
+ const snapSet = new Set(m.files);
249
+ if (current.length !== m.files.length) {
250
+ // could still be equal set; check set equality
251
+ if (current.length !== snapSet.size)
252
+ return false;
253
+ }
254
+ if (current.length !== snapSet.size)
255
+ return false;
256
+ for (const rel of current) {
257
+ if (!snapSet.has(rel))
258
+ return false;
259
+ }
260
+ // compare contents
261
+ for (const rel of m.files) {
262
+ const a = join(this.workspace, rel);
263
+ const b = join(this.filesDir(id), rel);
264
+ if (!existsSync(a) || !existsSync(b))
265
+ return false;
266
+ if (!readFileSync(a).equals(readFileSync(b)))
267
+ return false;
268
+ }
269
+ // skipped entries (e.g. symlinks) must keep the same shape/target
270
+ for (const sk of m.skipped ?? []) {
271
+ const full = join(this.workspace, sk.path);
272
+ if (!existsSync(full))
273
+ continue;
274
+ if (sk.reason === "symlink") {
275
+ if (!lstatSync(full).isSymbolicLink())
276
+ return false;
277
+ if (sk.target !== undefined) {
278
+ try {
279
+ if (readlinkSync(full) !== sk.target)
280
+ return false;
281
+ }
282
+ catch {
283
+ return false;
284
+ }
285
+ }
286
+ }
287
+ }
288
+ return true;
289
+ }
290
+ previewRestore(id, keepUntracked = false) {
291
+ const m = this.get(id);
292
+ if (!m)
293
+ throw new Error("CHECKPOINT_NOT_FOUND");
294
+ const snapSet = new Set(m.files);
295
+ const current = this.listWorkspaceFiles();
296
+ const changed = [];
297
+ const restored = [];
298
+ const removed = [];
299
+ for (const rel of m.files) {
300
+ const cur = join(this.workspace, rel);
301
+ const snap = join(this.filesDir(id), rel);
302
+ if (!existsSync(cur)) {
303
+ restored.push(rel);
304
+ }
305
+ else if (!readFileSync(cur).equals(readFileSync(snap))) {
306
+ changed.push(rel);
307
+ }
308
+ }
309
+ if (!keepUntracked) {
310
+ for (const rel of current) {
311
+ if (!snapSet.has(rel))
312
+ removed.push(rel);
313
+ }
314
+ }
315
+ return { changed, restored, removed };
316
+ }
317
+ restore(id, keepUntracked = false) {
318
+ const m = this.get(id);
319
+ if (!m)
320
+ throw new Error("CHECKPOINT_NOT_FOUND");
321
+ const preview = this.previewRestore(id, keepUntracked);
322
+ // write snapshot files
323
+ for (const rel of m.files) {
324
+ const src = join(this.filesDir(id), rel);
325
+ const dst = join(this.workspace, rel);
326
+ if (!existsSync(src))
327
+ continue;
328
+ mkdirSync(join(dst, ".."), { recursive: true });
329
+ copyFileSync(src, dst);
330
+ }
331
+ // remove
332
+ if (!keepUntracked) {
333
+ const snapSet = new Set(m.files);
334
+ const current = this.listWorkspaceFiles();
335
+ for (const rel of current) {
336
+ if (snapSet.has(rel))
337
+ continue;
338
+ const full = join(this.workspace, rel);
339
+ if (existsSync(full)) {
340
+ rmSync(full, { force: true });
341
+ }
342
+ }
343
+ }
344
+ return preview;
345
+ }
346
+ diff(id) {
347
+ let manifest;
348
+ if (id)
349
+ manifest = this.get(id);
350
+ else {
351
+ const list = this.list();
352
+ if (list.length)
353
+ manifest = list[0];
354
+ }
355
+ if (manifest) {
356
+ const snapSet = new Set(manifest.files);
357
+ const current = this.listWorkspaceFiles();
358
+ const out = [];
359
+ for (const rel of manifest.files) {
360
+ const cur = join(this.workspace, rel);
361
+ if (!existsSync(cur)) {
362
+ out.push({ path: rel, status: "deleted" });
363
+ }
364
+ else if (!readFileSync(cur).equals(readFileSync(join(this.filesDir(manifest.id), rel)))) {
365
+ out.push({ path: rel, status: "modified" });
366
+ }
367
+ }
368
+ for (const rel of current) {
369
+ if (!snapSet.has(rel))
370
+ out.push({ path: rel, status: "added" });
371
+ }
372
+ return out.sort((a, b) => a.path.localeCompare(b.path));
373
+ }
374
+ // fallback to git HEAD
375
+ try {
376
+ const out = [];
377
+ const nameStatus = this.runGit(["diff", "--name-status", "HEAD"]);
378
+ for (const line of nameStatus.split("\n").filter(Boolean)) {
379
+ const [code, ...rest] = line.split("\t");
380
+ const p = rest.join("\t");
381
+ if (code.startsWith("A"))
382
+ out.push({ path: p, status: "added" });
383
+ else if (code.startsWith("D"))
384
+ out.push({ path: p, status: "deleted" });
385
+ else
386
+ out.push({ path: p, status: "modified" });
387
+ }
388
+ const untracked = this.runGit(["ls-files", "--others", "--exclude-standard"]).split("\n").filter(Boolean);
389
+ for (const p of untracked)
390
+ out.push({ path: p, status: "added" });
391
+ return out;
392
+ }
393
+ catch {
394
+ return [];
395
+ }
396
+ }
397
+ discard(id) {
398
+ rmSync(this.checkpointDir(id), { recursive: true, force: true });
399
+ }
400
+ snapshotFileContent(id, rel) {
401
+ const m = this.get(id);
402
+ if (!m || !m.files.includes(rel))
403
+ return null;
404
+ const full = join(this.filesDir(id), rel);
405
+ if (!existsSync(full))
406
+ return null;
407
+ return readFileSync(full);
408
+ }
409
+ prune() {
410
+ const list = this.list();
411
+ if (list.length <= this.maxCount)
412
+ return;
413
+ const toRemove = list.slice(this.maxCount);
414
+ for (const m of toRemove) {
415
+ rmSync(this.checkpointDir(m.id), { recursive: true, force: true });
416
+ }
417
+ }
418
+ }
419
+ //# sourceMappingURL=checkpoint-store.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"checkpoint-store.js","sourceRoot":"","sources":["../../src/runtime/checkpoint-store.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ /** Tools disabled in plan mode. */
2
+ export declare const PLAN_BLOCKED_TOOLS: Set<string>;
3
+ export declare function isToolAllowed(mode: "plan" | "yolo", toolName: string): boolean;
@@ -0,0 +1,8 @@
1
+ /** Tools disabled in plan mode. */
2
+ export const PLAN_BLOCKED_TOOLS = new Set(["write", "edit", "bash"]);
3
+ export function isToolAllowed(mode, toolName) {
4
+ if (mode === "yolo")
5
+ return true;
6
+ return !PLAN_BLOCKED_TOOLS.has(toolName);
7
+ }
8
+ //# sourceMappingURL=modes.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"modes.js","sourceRoot":"","sources":["../../src/runtime/modes.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAErE,MAAM,UAAU,aAAa,CAAC,IAAqB,EAAE,QAAgB;IACnE,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACjC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC3C,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import { resolve } from "node:path";
2
2
  import { LockManager } from "./locks.js";
3
+ import { isToolAllowed } from "./modes.js";
3
4
  function resourceKey(call, workspace) {
4
5
  const args = call.arguments ?? {};
5
6
  if (call.name === "bash")
@@ -83,6 +84,15 @@ export class ToolExecutor {
83
84
  }
84
85
  const tasks = calls.map((call, i) => {
85
86
  return (async () => {
87
+ if (!isToolAllowed(ctx.mode ?? "yolo", call.name)) {
88
+ results[i] = {
89
+ toolCallId: call.id,
90
+ name: call.name,
91
+ content: "plan mode: tool disabled",
92
+ isError: true,
93
+ };
94
+ return;
95
+ }
86
96
  if (signal.aborted) {
87
97
  results[i] = { toolCallId: call.id, name: call.name, content: "USER_CANCELLED", isError: true };
88
98
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"tool-executor.js","sourceRoot":"","sources":["../../src/runtime/tool-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool-executor.js","sourceRoot":"","sources":["../../src/runtime/tool-executor.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { readdirSync, readFileSync, existsSync, statSync } from "node:fs";
2
- import { join } from "node:path";
2
+ import { join, dirname, resolve } from "node:path";
3
+ import { fileURLToPath } from "node:url";
3
4
  import { homedir } from "node:os";
4
5
  /**
5
6
  * Signature of every skill file (path, mtime, size). ContextManager caches the
@@ -7,7 +8,9 @@ import { homedir } from "node:os";
7
8
  * invalidates the cache while normal turns stay allocation-light.
8
9
  */
9
10
  export function skillCacheSignature(workspace) {
11
+ const bundledDir = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "skills");
10
12
  const dirs = [
13
+ bundledDir,
11
14
  join(homedir(), ".agents", "skills"),
12
15
  join(workspace, ".agents", "skills"),
13
16
  ];
@@ -93,12 +96,16 @@ function scanDir(dir, scope) {
93
96
  export class DefaultSkillRegistry {
94
97
  skills = [];
95
98
  constructor(workspace) {
99
+ const bundledDir = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "skills");
96
100
  const globalDir = join(homedir(), ".agents", "skills");
97
101
  const projectDir = join(workspace, ".agents", "skills");
102
+ const bundledSkills = scanDir(bundledDir, "global");
98
103
  const globalSkills = scanDir(globalDir, "global");
99
104
  const projectSkills = scanDir(projectDir, "project");
100
105
  // project overrides global on name collision
101
106
  const map = new Map();
107
+ for (const s of bundledSkills)
108
+ map.set(s.name, s);
102
109
  for (const s of globalSkills)
103
110
  map.set(s.name, s);
104
111
  for (const s of projectSkills)
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/skills/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/skills/registry.ts"],"names":[],"mappings":"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"}
@@ -8,18 +8,20 @@ const ArgsSchema = z
8
8
  command: z.string(),
9
9
  cwd: z.string().optional(),
10
10
  timeout_ms: z.number().int().positive().optional(),
11
+ background: z.boolean().optional(),
11
12
  })
12
13
  .strict();
13
14
  export const bashTool = {
14
15
  definition: {
15
16
  name: "bash",
16
- description: "Execute a shell command and return its output.",
17
+ description: "Execute a shell command and return its output. Set background:true to run asynchronously.",
17
18
  parameters: {
18
19
  type: "object",
19
20
  properties: {
20
21
  command: { type: "string" },
21
22
  cwd: { type: "string" },
22
23
  timeout_ms: { type: "integer", minimum: 1 },
24
+ background: { type: "boolean" },
23
25
  },
24
26
  required: ["command"],
25
27
  additionalProperties: false,
@@ -35,19 +37,53 @@ export const bashTool = {
35
37
  isError: true,
36
38
  };
37
39
  }
38
- const { command, cwd, timeout_ms } = parsed.data;
40
+ const { command, cwd, timeout_ms, background } = parsed.data;
41
+ if (background) {
42
+ if (!ctx.backgroundTasks) {
43
+ return { toolCallId: call.id, name: "bash", content: "BACKGROUND_TASKS_UNAVAILABLE", isError: true };
44
+ }
45
+ const workdir = cwd ? resolve(ctx.workspace, cwd) : ctx.workspace;
46
+ if (cwd && !isWithinWorkspace(ctx.workspace, cwd)) {
47
+ return { toolCallId: call.id, name: "bash", content: "PATH_OUTSIDE_WORKSPACE", isError: true };
48
+ }
49
+ try {
50
+ const task = ctx.backgroundTasks.start(command, workdir, process.env);
51
+ return { toolCallId: call.id, name: "bash", content: JSON.stringify({ task_id: task.id, status: "started", command }) };
52
+ }
53
+ catch (err) {
54
+ return { toolCallId: call.id, name: "bash", content: `COMMAND_FAILED: ${err instanceof Error ? err.message : String(err)}`, isError: true };
55
+ }
56
+ }
39
57
  const capMs = ctx.maxBashTimeMs ?? 120000;
40
58
  const timeout = Math.min(timeout_ms ?? capMs, capMs);
41
59
  const workdir = cwd ? resolve(ctx.workspace, cwd) : ctx.workspace;
42
- if (cwd && !isWithinWorkspace(ctx.workspace, cwd)) {
43
- return {
44
- toolCallId: call.id,
45
- name: "bash",
46
- content: "PATH_OUTSIDE_WORKSPACE",
47
- isError: true,
48
- };
60
+ const cwdOutside = !!cwd && !isWithinWorkspace(ctx.workspace, cwd);
61
+ if (cwdOutside) {
62
+ if (ctx.approvals?.nonInteractive || !ctx.approvals?.handler) {
63
+ return {
64
+ toolCallId: call.id,
65
+ name: "bash",
66
+ content: "PATH_OUTSIDE_WORKSPACE",
67
+ isError: true,
68
+ };
69
+ }
70
+ const { checkApproval } = await import("../runtime/approvals.js");
71
+ const decision = await checkApproval(ctx.approvals, {
72
+ command,
73
+ cwd: workdir,
74
+ timeoutMs: timeout,
75
+ sandboxed: false,
76
+ });
77
+ if (!decision.allowed) {
78
+ return {
79
+ toolCallId: call.id,
80
+ name: "bash",
81
+ content: "COMMAND_APPROVAL_REQUIRED",
82
+ isError: true,
83
+ };
84
+ }
49
85
  }
50
- if (ctx.approvals) {
86
+ if (ctx.mode !== "yolo" && ctx.approvals) {
51
87
  const { checkApproval } = await import("../runtime/approvals.js");
52
88
  const decision = await checkApproval(ctx.approvals, {
53
89
  command,