@cmodjs/core 0.3.0 → 1.5.0

package/jobs/context.d.ts

@@ -1,14 +1,13 @@
-import type { JobContext, Mod } from '../mod.js';
+import type { JobContext } from '../mod.js';
 import { type Deadline } from '../runtime/deadline.js';
-import type { ToolCall } from '../utils/call-effects.js';
+import type { Call } from '../utils/call-effects.js';
 import { type Workspace } from './permissions/find-project-scope.js';
 import { type Target } from './permissions/match-target.js';
-export declare function workspaceReader({ mod: { claude } }: JobContext): () => Promise<Workspace>;
-export declare function afterCall<State extends object>(job: JobContext<State>, contextAfter: (call: ToolCall, workspace: Workspace) => Promise<readonly string[]>, failed: (error: unknown) => readonly string[]): void;
-export declare function modOf<State extends object>(job: JobContext<State>, { call, folder }: {
-    readonly call?: ToolCall;
+export declare function workspaceReader({ mod }: JobContext): () => Promise<Workspace>;
+export declare function afterCall<State extends object>(job: JobContext<State>, contextAfter: (call: Call, workspace: Workspace) => Promise<readonly string[]>, failed: (error: unknown) => readonly string[]): void;
+export declare function inFolder(call: Call, folder: string, workspace: Workspace): Promise<Call & {
     readonly folder: string;
-}, workspace: Workspace, deadline: Deadline): Mod<State>;
-export declare function modWithin<State extends object>({ mod }: JobContext<State>, deadline: Deadline, workTree?: () => Promise<string | undefined>): Mod<State>;
+}>;
+export declare function withinDeadline<Value>(mod: object, deadline: Deadline, subject: string, run: () => Value | Promise<Value>): Promise<Value>;
 export declare function targetWords(target: Target): string;
 //# sourceMappingURL=context.d.ts.map

package/jobs/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/jobs/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAEhD,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAItE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACtF,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAOrE,wBAAgB,eAAe,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAOzF;AAaD,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAC5C,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,EACtB,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,EAClF,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,SAAS,MAAM,EAAE,GAC5C,IAAI,CAUN;AAMD,wBAAgB,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAEjM;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAyB,GAAG,GAAG,CAAC,KAAK,CAAC,CA4B/K;AAwBD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CASlD"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/jobs/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAItE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACtF,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAKrE,wBAAgB,eAAe,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAmB7E;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,SAAS,MAAM,EAAE,GAAG,IAAI,CAW3M;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAE5H;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAEzI;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CASlD"}

package/jobs/context.js

@@ -1,33 +1,35 @@
 import { beforeDeadline } from '../runtime/deadline.js';
-import { dependencyCalls } from '../runtime/dependencies.js';
+import { engineOf } from '../runtime/engine.js';
 import { toolInputOf } from '../runtime/tool-calls.js';
 import { listed } from '../utils/text.js';
 import { findProjectScope } from './permissions/find-project-scope.js';
 import { targetOf } from './permissions/match-target.js';
-export function workspaceReader({ mod: { claude } }) {
+export function workspaceReader({ mod }) {
+    const { claude } = engineOf(mod);
     let session;
     return async () => {
-        session ??= readSession(claude);
+        session ??= readSession();
         const [{ home, scope, fs }, projectRoot, cwd] = await Promise.all([session, claude.session.root(), claude.session.cwd()]);
         return { projectRoot, cwd, home, fs, scope };
     };
-}
-async function readSession(claude) {
-    const fs = {
-        read: (path) => claude.fs.read(path),
-        stat: (path) => claude.fs.stat(path, { resolve: true }),
-        exists: (path) => claude.fs.exists(path),
-    };
-    const home = await claude.env.home();
-    if (home === undefined)
-        throw new Error('HOME is not set, so ~ in a path has no meaning. Start Claude Code with HOME set.');
-    return { home, fs, scope: await findProjectScope(claude.plugin.root, home, fs) };
+    async function readSession() {
+        const fs = {
+            read: (path) => claude.fs.read(path),
+            stat: (path) => claude.fs.stat(path, { resolve: true }),
+            exists: (path) => claude.fs.exists(path),
+        };
+        const home = await claude.env.home();
+        if (home === undefined)
+            throw new Error('HOME is not set, so ~ in a path has no meaning. Start Claude Code with HOME set.');
+        return { home, fs, scope: await findProjectScope(claude.plugin.root, home, fs) };
+    }
 }
 export function afterCall(job, contextAfter, failed) {
+    const { router, toolCalls } = engineOf(job.mod);
     const readWorkspace = workspaceReader(job);
-    job.mod.claude.on('tool.call', async (e, next) => {
-        const before = Promise.all([useOf(job, e), readWorkspace()]);
-        await before.catch(() => undefined);
+    router.add('tool.call', async (e, next) => {
+        const before = Promise.all([toolCalls.agentOf(e.tool_use_id).then((agent) => ({ tool: e.tool, input: toolInputOf(e), ...agent })), readWorkspace()]);
+        await Promise.allSettled([before]);
         const result = await next(e);
         if (result.deny !== undefined || result.isError === true)
             return result;
@@ -35,63 +37,11 @@ export function afterCall(job, contextAfter, failed) {
         return added.length === 0 ? result : { ...result, context: [...(result.context ?? []), ...added] };
     });
 }
-async function useOf({ toolCalls }, e) {
-    return { tool: e.tool, input: toolInputOf(e), ...(await toolCalls.agentOf(e.tool_use_id)) };
-}
-export function modOf(job, { call, folder }, workspace, deadline) {
-    return modWithin(job, deadline, async () => workspace.scope?.workTreeOf(call !== undefined && 'path' in call ? call.path : folder));
+export async function inFolder(call, folder, workspace) {
+    return { ...call, folder: (await workspace.scope?.workTreeOf('path' in call ? call.path : folder)) ?? folder };
 }
-export function modWithin({ mod }, deadline, workTree = async () => undefined) {
-    const { claude } = mod;
-    const within = (call, task) => beforeDeadline(claude, deadline, call, task);
-    const folderOf = async (cwd) => {
-        const folder = cwd ?? (await workTree());
-        return folder === undefined ? {} : { cwd: folder };
-    };
-    const overrides = {
-        process: {
-            async run(argv, init) {
-                const folder = await folderOf(init?.cwd);
-                const timeoutMs = Math.min(init?.timeoutMs ?? deadline.ms, deadline.longestMs ?? deadline.ms);
-                return beforeDeadline(claude, { ...deadline, ms: timeoutMs }, 'mod.process.run', mod.process.run(argv, { ...init, ...folder, timeoutMs }));
-            },
-            spawn: (argv, init) => spawnWithin(claude, deadline, folderOf(init?.cwd).then((folder) => mod.process.spawn(argv, { ...init, ...folder }))),
-        },
-        fs: {
-            read: (path) => within('mod.fs.read', mod.fs.read(path)),
-            write: (path, text) => within('mod.fs.write', mod.fs.write(path, text)),
-            list: (path) => within('mod.fs.list', mod.fs.list(path)),
-            exists: (path) => within('mod.fs.exists', mod.fs.exists(path)),
-            stat: (path, options) => within('mod.fs.stat', mod.fs.stat(path, options)),
-            find: (glob) => within('mod.fs.find', mod.fs.find(glob)),
-        },
-        http: { fetch: (url, init) => within('mod.http.fetch', mod.http.fetch(url, init)) },
-        dependencies: dependencyCalls(claude, within),
-    };
-    return Object.assign(Object.create(mod), overrides);
-}
-function spawnWithin(claude, deadline, started) {
-    async function* pieces() {
-        const stream = await started;
-        let finish = () => undefined;
-        const running = beforeDeadline(claude, deadline, 'mod.process.spawn', new Promise((resolve) => (finish = resolve)));
-        const passed = running.then(() => new Promise(() => undefined));
-        try {
-            for (;;) {
-                const piece = await Promise.race([stream.next(), passed]);
-                if (piece.done === true)
-                    return piece.value;
-                yield piece.value;
-            }
-        }
-        finally {
-            finish();
-            void stream.return?.();
-        }
-    }
-    const result = started.then((stream) => stream.result);
-    result.catch(() => undefined);
-    return Object.assign(pieces(), { result });
+export function withinDeadline(mod, deadline, subject, run) {
+    return beforeDeadline(engineOf(mod).claude, deadline, subject, Promise.resolve().then(run));
 }
 export function targetWords(target) {
     const { key, patterns, exclusions } = targetOf(target);

package/jobs/permissions/decide-permission.d.ts

@@ -1,9 +1,11 @@
-import { type ToolCall } from '../../utils/call-effects.js';
+import { type Call } from '../../utils/call-effects.js';
 import type { Workspace } from './find-project-scope.js';
 import { type TargetCalls, type TargetKey, type TargetOf } from './match-target.js';
 export type Rule<Mod> = {
     [Key in TargetKey]: TargetOf<Key> & {
-        when?: (call: TargetCalls[Key], mod: Mod) => boolean | Promise<boolean>;
+        when?: (call: TargetCalls[Key] & {
+            readonly folder: string;
+        }, mod: Mod) => boolean | Promise<boolean>;
         reason?: string;
     };
 }[TargetKey];
@@ -17,5 +19,5 @@ export type Verdict = {
     reason?: string;
 };
 export declare function stricterVerdict<Result extends Verdict>(first: Result, second: Result): Result;
-export declare function decidePermission<Mod>(rules: PermissionRules<Mod>, use: ToolCall, workspace: Workspace, modOf: (call: ToolCall, folder: string) => Mod): Promise<Verdict | undefined>;
+export declare function decidePermission<Mod>(rules: PermissionRules<Mod>, use: Call, workspace: Workspace, mod: Mod, within: (run: () => boolean | Promise<boolean>) => Promise<boolean>): Promise<Verdict | undefined>;
 //# sourceMappingURL=decide-permission.d.ts.map

package/jobs/permissions/decide-permission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decide-permission.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/decide-permission.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6C,KAAK,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACtG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAuE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGxJ,MAAM,MAAM,IAAI,CAAC,GAAG,IAAI;KACrB,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG;QAClC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;QACvE,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB;CACF,CAAC,SAAS,CAAC,CAAA;AAEZ,MAAM,MAAM,eAAe,CAAC,GAAG,IAAI;IAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;CAAE,CAAA;AAC5E,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;AAC/C,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAI7D,wBAAgB,eAAe,CAAC,MAAM,SAAS,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7F;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAe1L"}
+{"version":3,"file":"decide-permission.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/decide-permission.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6C,KAAK,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAuE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIxJ,MAAM,MAAM,IAAI,CAAC,GAAG,IAAI;KACrB,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG;QAClC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG;YAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;SAAE,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;QACrG,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB;CACF,CAAC,SAAS,CAAC,CAAA;AAEZ,MAAM,MAAM,eAAe,CAAC,GAAG,IAAI;IAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;CAAE,CAAA;AAC5E,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;AAC/C,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAI7D,wBAAgB,eAAe,CAAC,MAAM,SAAS,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7F;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAerN"}

package/jobs/permissions/decide-permission.js

@@ -3,16 +3,17 @@ import { messageOf } from '../../utils/text.js';
 import { callBaseOf, callEffects } from '../../utils/call-effects.js';
 import { folderInScope, matchTarget, targetOf } from './match-target.js';
 import { resolve } from '../../vendor.js';
+import { inFolder } from '../context.js';
 const wordBoundary = '\\s;&|()<>\'"`=';
 export function stricterVerdict(first, second) {
     return strictness.indexOf(second.decision) > strictness.indexOf(first.decision) ? second : first;
 }
-export async function decidePermission(rules, use, workspace, modOf) {
+export async function decidePermission(rules, use, workspace, mod, within) {
     try {
         const effects = callEffects(use, workspace);
         for (const decision of ['deny', 'ask']) {
             for (const rule of rules[decision] ?? []) {
-                const outcome = await ruleOutcome(rule, use, effects, workspace, modOf);
+                const outcome = await ruleOutcome(rule, use, effects, workspace, mod, within);
                 if (outcome === undefined)
                     continue;
                 const reason = [rule.reason, outcome.failure === undefined ? undefined : `Its when check failed: ${outcome.failure}`].filter((part) => part !== undefined).join(' ');
@@ -25,7 +26,7 @@ export async function decidePermission(rules, use, workspace, modOf) {
         return { decision: 'deny', reason: `The permissions job failed, so it denies the call: ${messageOf(error)}` };
     }
 }
-async function ruleOutcome(rule, use, effects, workspace, modOf) {
+async function ruleOutcome(rule, use, effects, workspace, mod, within) {
     const matched = await matchTarget(rule, use, effects, workspace);
     const calls = matched.length > 0 ? matched : await unparsedMatches(rule, use, effects, workspace);
     if (calls.length === 0)
@@ -36,7 +37,8 @@ async function ruleOutcome(rule, use, effects, workspace, modOf) {
     for (const { call, access, folder } of calls) {
         const fullCall = access?.contents === undefined ? call : { ...call, ...(await access.contents()) };
         try {
-            if (await when(fullCall, modOf(fullCall, folder)))
+            const placed = await inFolder(fullCall, folder, workspace);
+            if (await within(() => when(placed, mod)))
                 return { failure: undefined };
         }
         catch (error) {

package/jobs/permissions/find-project-scope.d.ts

@@ -1,4 +1,4 @@
-import type { FileSystem } from '../../utils/paths.js';
+import { type FileSystem } from '../../utils/paths.js';
 export type ProjectScope = {
     workTreeOf: (path: string) => Promise<string | undefined>;
 };

package/jobs/permissions/find-project-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-project-scope.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/find-project-scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGtD,MAAM,MAAM,YAAY,GAAG;IAAE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,CAAA;AAExF,MAAM,MAAM,SAAS,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,CAAA;AAE3H,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAwB1H"}
+{"version":3,"file":"find-project-scope.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/find-project-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjE,MAAM,MAAM,YAAY,GAAG;IAAE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,CAAA;AAExF,MAAM,MAAM,SAAS,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,CAAA;AAE3H,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAwB1H"}

package/jobs/permissions/find-project-scope.js

@@ -1,3 +1,4 @@
+import { ifMissing } from '../../utils/paths.js';
 import { basename, dirname, resolve } from '../../vendor.js';
 export async function findProjectScope(pluginRoot, home, fs) {
     const skills = dirname(pluginRoot);
@@ -32,20 +33,16 @@ export async function findProjectScope(pluginRoot, home, fs) {
 }
 async function readRepository(workTree, fs) {
     const gitPath = resolve(workTree, '.git');
-    const git = await fs.stat(gitPath).catch(() => undefined);
+    const git = await fs.stat(gitPath).catch(ifMissing(undefined));
     if (git === undefined)
         return undefined;
     if (git.kind === 'dir')
         return git.realPath ?? gitPath;
-    try {
-        const gitDirectory = /^gitdir:\s*(.+)$/m.exec(await fs.read(gitPath))?.[1]?.trim();
-        if (gitDirectory === undefined)
-            throw new Error(`${gitPath} has no gitdir line.`);
-        const linkedDirectory = resolve(workTree, gitDirectory);
-        const commonDirectory = await fs.read(resolve(linkedDirectory, 'commondir')).then((text) => resolve(linkedDirectory, text.trim()), () => linkedDirectory);
-        return (await fs.stat(commonDirectory)).realPath ?? commonDirectory;
-    }
-    catch {
+    const gitDirectory = /^gitdir:\s*(.+)$/m.exec(await fs.read(gitPath))?.[1]?.trim();
+    if (gitDirectory === undefined)
         return workTree;
-    }
+    const linkedDirectory = resolve(workTree, gitDirectory);
+    const commonDirectory = await fs.read(resolve(linkedDirectory, 'commondir')).then((text) => resolve(linkedDirectory, text.trim()), ifMissing(linkedDirectory));
+    const common = await fs.stat(commonDirectory).catch(ifMissing(undefined));
+    return common === undefined ? workTree : (common.realPath ?? commonDirectory);
 }

package/jobs/permissions/match-target.d.ts

@@ -1,4 +1,4 @@
-import { type CallBase, type CallEffects, type CommandCall, type FetchCall, type FileAccess, type FileCall, type ToolCall } from '../../utils/call-effects.js';
+import { type CallBase, type CallEffects, type CommandCall, type FetchCall, type FileAccess, type FileCall, type Call } from '../../utils/call-effects.js';
 import type { Workspace } from './find-project-scope.js';
 export type TargetCalls = {
     command: CommandCall;
@@ -14,7 +14,7 @@ export type Target = {
     [Key in TargetKey]: TargetOf<Key>;
 }[TargetKey];
 export type MatchedCall = {
-    call: ToolCall;
+    call: Call;
     access: FileAccess | undefined;
     folder: string;
 };

package/jobs/permissions/match-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"match-target.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/match-target.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAC1K,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,MAAM,WAAW,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAA;AACzI,MAAM,MAAM,SAAS,GAAG,MAAM,WAAW,CAAA;AACzC,MAAM,MAAM,QAAQ,CAAC,GAAG,SAAS,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9H,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC;CAAE,CAAC,SAAS,CAAC,CAAA;AACrE,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAI5F,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAWrG;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAkCpI;AA4BD,wBAAsB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI/H"}
+{"version":3,"file":"match-target.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/match-target.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,MAAM,6BAA6B,CAAA;AACtK,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,MAAM,WAAW,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAA;AACzI,MAAM,MAAM,SAAS,GAAG,MAAM,WAAW,CAAA;AACzC,MAAM,MAAM,QAAQ,CAAC,GAAG,SAAS,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9H,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC;CAAE,CAAC,SAAS,CAAC,CAAA;AACrE,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIxF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAWrG;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAkCpI;AA4BD,wBAAsB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI/H"}

package/jobs/permissions.d.ts

@@ -1,6 +1,6 @@
 import type { Job, Mod } from '../mod.js';
 import { type PermissionRules as RulesFor, type Rule as RuleFor } from './permissions/decide-permission.js';
-export type { CommandCall, FetchCall, FileCall, ToolCall } from '../utils/call-effects.js';
+export type { CommandCall, FetchCall, FileCall, Call } from '../utils/call-effects.js';
 export type { Target } from './permissions/match-target.js';
 export type Rule<State extends object = Record<never, never>> = RuleFor<Mod<State>>;
 export type PermissionRules<State extends object = Record<never, never>> = RulesFor<Mod<State>>;

package/jobs/permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/jobs/permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAGzC,OAAO,EAAqC,KAAK,eAAe,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,OAAO,EAAgB,MAAM,oCAAoC,CAAA;AAK5J,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC1F,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACnF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AAI/F,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA6BrK"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/jobs/permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIzC,OAAO,EAAqC,KAAK,eAAe,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,OAAO,EAAgB,MAAM,oCAAoC,CAAA;AAK5J,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACtF,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACnF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AAI/F,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA8BrK"}

package/jobs/permissions.js

@@ -1,14 +1,16 @@
+import { engineOf } from '../runtime/engine.js';
 import { inputOf } from '../utils/call-effects.js';
 import { decidePermission, stricterVerdict } from './permissions/decide-permission.js';
 import { targetOf } from './permissions/match-target.js';
 import { messageOf } from '../utils/text.js';
-import { modOf, workspaceReader } from './context.js';
+import { withinDeadline, workspaceReader } from './context.js';
 const deadline = { ms: 2000, job: 'permissions' };
 export function permissions(rules) {
     const count = typeof rules === 'function' ? undefined : checkedCount(rules);
     if (count === 0)
         throw new Error('permissions: give it a deny or an ask rule, or remove it from setup.');
     return (job) => {
+        const { router, toolCalls } = engineOf(job.mod);
         const readWorkspace = workspaceReader(job);
         const verdictOf = async (e) => {
             let current;
@@ -20,14 +22,14 @@ export function permissions(rules) {
                 return { decision: 'deny', reason: `The permission rules of ${job.mod.name} failed, so it denies the call: ${messageOf(error)}` };
             }
             try {
-                const [agent, workspace] = await Promise.all([job.toolCalls.agentOf(e.tool_use_id), readWorkspace()]);
-                return await decidePermission(current, { tool: e.tool, input: inputOf(e.input), ...agent }, workspace, (call, folder) => modOf(job, { call, folder }, workspace, deadline));
+                const [agent, workspace] = await Promise.all([toolCalls.agentOf(e.tool_use_id), readWorkspace()]);
+                return await decidePermission(current, { tool: e.tool, input: inputOf(e.input), ...agent }, workspace, job.mod, (run) => withinDeadline(job.mod, deadline, 'it', run));
             }
             catch (error) {
                 return { decision: 'deny', reason: `The permissions job could not read the session, so it denies the call: ${messageOf(error)}` };
             }
         };
-        job.mod.claude.on('tool.check', async (e, next) => {
+        router.add('tool.check', async (e, next) => {
             const [below, ours] = await Promise.all([next(e), verdictOf(e)]);
             return ours === undefined ? below : stricterVerdict(below, ours);
         });

package/jobs/program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/jobs/program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;IACxE,KAAK,IAAI,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACvD,CAAA;AAMD,wBAAgB,OAAO,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAAC,CA2ErI"}
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/jobs/program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAKpC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;IACxE,KAAK,IAAI,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACvD,CAAA;AAMD,wBAAgB,OAAO,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAAC,CAmFrI"}

package/jobs/program.js

@@ -1,10 +1,11 @@
-import { PermissionRefused } from '../runtime/grants.js';
+import { PermissionRefused, programAddresses } from '../runtime/grants.js';
+import { engineOf } from '../runtime/engine.js';
 import { messageOf } from '../utils/text.js';
 const backoffSeconds = [1, 2, 4, 8, 16];
 export function program(options) {
     const { command, environment } = options;
     return ({ mod, announce }) => {
-        const { claude } = mod;
+        const { claude, report } = engineOf(mod);
         const [executable] = command;
         if (executable === undefined)
             throw new Error(`${mod.name}: the program has no command. Name the program on PATH and its arguments, such as ['preview-server', '--port', '0'].`);
@@ -13,10 +14,16 @@ export function program(options) {
         let failure;
         let exits = 0;
         const waiting = [];
+        const ownAddresses = programAddresses(mod);
         const stop = (reason) => {
             state = 'fatal';
             failure = new Error(`${mod.name}: the ${executable} program stopped: ${reason}`);
-            claude.ui.log(failure.message);
+            const retry = () => {
+                exits = 0;
+                failure = undefined;
+                void start();
+            };
+            report({ id: `program:${executable}`, message: `The ${executable} program stopped`, description: reason, retry });
             for (const waiter of waiting.splice(0))
                 waiter.reject(failure);
         };
@@ -44,6 +51,7 @@ export function program(options) {
                     }
                     state = 'running';
                     exits = 0;
+                    ownAddresses.add(address.socketPath ?? new URL(address.url).host);
                     for (const waiter of waiting.splice(0))
                         waiter.resolve(address);
                 }
@@ -53,11 +61,13 @@ export function program(options) {
                     return stop(`${messageOf(error)} Add it, then run /reload-plugins.`);
                 lastError = messageOf(error);
             }
+            if (address !== undefined)
+                ownAddresses.delete(address.socketPath ?? new URL(address.url).host);
             address = undefined;
             exits += 1;
             const wait = backoffSeconds[exits - 1];
             if (wait === undefined) {
-                stop(`it did not start again after ${backoffSeconds.length} tries: ${lastError === '' ? 'no standard error' : lastError}. Fix it, then run /reload-plugins.`);
+                stop(`it did not start again after ${backoffSeconds.length} tries: ${lastError === '' ? 'no standard error' : lastError}.`);
                 return;
             }
             state = 'backoff';

package/jobs/prompt.d.ts

@@ -1,9 +1,11 @@
 import type { Job, Mod } from '../mod.js';
-import { type ToolCall } from '../utils/call-effects.js';
+import { type Call } from '../utils/call-effects.js';
 import { type Target } from './permissions/match-target.js';
 type PromptInput = {
     userPrompt?: string;
-    call?: ToolCall;
+    call?: Call & {
+        readonly folder: string;
+    };
 };
 type PromptOptions<State extends object> = {
     name: string;

package/jobs/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/jobs/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAc,GAAG,EAAE,MAAM,WAAW,CAAA;AAIrD,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAyB,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGlF,KAAK,WAAW,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAA;AAE3D,KAAK,aAAa,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACjD,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1B,CAAA;AAID,wBAAgB,MAAM,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoC/I"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/jobs/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAc,GAAG,EAAE,MAAM,WAAW,CAAA;AAKrD,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAyB,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGlF,KAAK,WAAW,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,GAAG;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAErF,KAAK,aAAa,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACjD,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1B,CAAA;AAID,wBAAgB,MAAM,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoC/I"}

package/jobs/prompt.js

@@ -1,10 +1,10 @@
-import { longestMs } from '../runtime/deadline.js';
+import { engineOf } from '../runtime/engine.js';
 import { onStateChange } from '../runtime/state.js';
 import { listed, messageOf } from '../utils/text.js';
 import { callEffects } from '../utils/call-effects.js';
 import { matchTarget, targetOf } from './permissions/match-target.js';
-import { afterCall, modOf, modWithin, targetWords } from './context.js';
-const deadline = { ms: 5000, longestMs, job: 'prompt' };
+import { afterCall, inFolder, targetWords, withinDeadline } from './context.js';
+const deadline = { ms: 5000, job: 'prompt' };
 export function prompt({ name, prompt: text, when, after }) {
     if (name.trim() === '')
         throw new Error('prompt: give the block a name. Claude reads the text under it.');
@@ -15,10 +15,10 @@ export function prompt({ name, prompt: text, when, after }) {
         targetOf(target);
     return (job) => {
         job.reserveName('prompt', name, `prompt: ${job.mod.name} adds the name "${name}" two times. Give each prompt its own name.`);
-        const log = (reason) => job.mod.claude.ui.log(`prompt "${name}" added nothing: ${reason}`, { to: 'debug' });
-        const textFor = async (input, mod) => {
+        const log = (reason) => job.mod.log(`prompt "${name}" added nothing: ${reason}`);
+        const textFor = async (input) => {
             try {
-                const value = typeof text === 'string' ? text : await text(input, mod);
+                const value = typeof text === 'string' ? text : await withinDeadline(job.mod, deadline, `the ${name} prompt`, () => text(input, job.mod));
                 return value === '' ? undefined : value;
             }
             catch (error) {
@@ -26,12 +26,12 @@ export function prompt({ name, prompt: text, when, after }) {
                 return undefined;
             }
         };
-        const headedText = async (input, mod) => {
-            const value = await textFor(input, mod);
+        const headedText = async (input) => {
+            const value = await textFor(input);
             return value === undefined ? undefined : `# ${name}\n${value}`;
         };
         if (when !== undefined) {
-            addAfterUserPrompts(job, when, (userPrompt) => headedText({ userPrompt }, modWithin(job, deadline)), log);
+            addAfterUserPrompts(job, when, (userPrompt) => headedText({ userPrompt }), log);
             job.announce(`the ${name} prompt after matching user prompts`);
         }
         else if (targets.length > 0) {
@@ -39,23 +39,24 @@ export function prompt({ name, prompt: text, when, after }) {
             job.announce(`the ${name} prompt after ${listed(targets.map(targetWords))}`);
         }
         else {
-            addKeptCurrent(job, name, () => textFor({}, modWithin(job, deadline)), log);
+            addKeptCurrent(job, name, () => textFor({}), log);
             job.announce(`the ${name} prompt`);
         }
     };
 }
 function addKeptCurrent(job, name, textFor, log) {
+    const { claude, router } = engineOf(job.mod);
     let given;
     let hasStarted = false;
     let isQueued = false;
     let updates = Promise.resolve();
-    job.mod.claude.on('classic.SessionStart', (e, next) => {
+    router.add('classic.SessionStart', (e, next) => {
         hasStarted = e.source === 'resume' || e.source === 'compact';
         if (!hasStarted)
             given = undefined;
         return next(e);
     });
-    job.mod.claude.on('prompt.context', async (e, next) => {
+    router.add('prompt.context', async (e, next) => {
         const below = await next(e);
         hasStarted = true;
         if (below.blocks.some((block) => block.name === name)) {
@@ -73,7 +74,7 @@ function addKeptCurrent(job, name, textFor, log) {
         if (value === undefined || value === given)
             return;
         given = value;
-        await job.mod.claude.session.append({ message: { type: 'user', content: [{ type: 'text', text: `# ${name}\n${value}` }] } }).then((added) => {
+        await claude.session.append({ message: { type: 'user', content: [{ type: 'text', text: `# ${name}\n${value}` }] } }).then((added) => {
             if (added.deny !== undefined)
                 log(`Claude Code refused the new text: ${added.deny}`);
         });
@@ -86,7 +87,7 @@ function addKeptCurrent(job, name, textFor, log) {
     });
 }
 function addAfterUserPrompts(job, when, textFor, log) {
-    job.mod.claude.on('prompt.submit', async (e, next) => {
+    engineOf(job.mod).router.add('prompt.submit', async (e, next) => {
         let value;
         try {
             if (typeof when === 'function' ? when(e.text) : e.text.search(when) >= 0)
@@ -105,7 +106,7 @@ function addAfterCalls(job, targets, textFor, log) {
             const [matched] = await matchTarget(target, use, effects, workspace);
             if (matched === undefined)
                 continue;
-            const value = await textFor({ call: matched.call }, modOf(job, matched, workspace, deadline));
+            const value = await textFor({ call: await inFolder(matched.call, matched.folder, workspace) });
             return value === undefined ? [] : [value];
         }
         return [];

package/jobs/schedule.d.ts

@@ -1,7 +1,7 @@
 import type { Job } from '../mod.js';
-export type Schedule = {
+export type ScheduledPrompt = {
     readonly cron: string;
     readonly prompt: string;
 };
-export declare function schedule<State extends object = Record<never, never>>(entry: Schedule | ((state: State) => Schedule | undefined)): Job<void, State>;
+export declare function schedule<State extends object = Record<never, never>>(entry: ScheduledPrompt | ((state: State) => ScheduledPrompt | undefined)): Job<void, State>;
 //# sourceMappingURL=schedule.d.ts.map

package/jobs/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/jobs/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIzE,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,QAAQ,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoDlJ"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/jobs/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIhF,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoDhK"}

package/jobs/schedule.js

@@ -1,20 +1,20 @@
 import { onStateChange } from '../runtime/state.js';
-import { messageOf } from '../utils/text.js';
+import { engineOf } from '../runtime/engine.js';
 const scheduleCounts = new WeakMap();
 export function schedule(entry) {
     if (typeof entry !== 'function')
         checked(entry);
     return (job) => {
         const { mod } = job;
-        const { claude } = mod;
+        const { claude, report: reportFailure } = engineOf(mod);
         const order = scheduleCounts.get(mod) ?? 0;
         scheduleCounts.set(mod, order + 1);
         const storeKey = `cmod:schedule:${order}`;
-        const log = (reason) => claude.ui.log(`${mod.name}: the schedule ${reason}`);
+        const report = (message, error) => reportFailure({ id: storeKey, message: `The schedule ${message}`, error });
         let current;
         let isQueued = false;
         const remove = async (id) => {
-            await claude.tool.call({ tool: 'CronDelete', id }).catch(() => undefined);
+            await claude.tool.call({ tool: 'CronDelete', id }).catch((error) => report(`could not delete its last cron ${id}`, error));
             await claude.store.delete(storeKey);
         };
         const update = async () => {
@@ -26,7 +26,7 @@ export function schedule(entry) {
                     checked(next);
             }
             catch (error) {
-                log(`kept its last cron: ${messageOf(error)}`);
+                report('kept its last cron', error);
                 return;
             }
             const wanted = next === undefined ? undefined : JSON.stringify([next.cron, next.prompt]);
@@ -39,9 +39,9 @@ export function schedule(entry) {
                 return;
             const answer = await claude.tool.call({ tool: 'CronCreate', cron: next.cron, prompt: next.prompt, recurring: true });
             if (answer.deny !== undefined)
-                return log(`was refused: ${answer.deny}`);
+                return report('was refused', answer.deny);
             if (answer.isError === true)
-                return log(`failed: ${answer.text ?? 'CronCreate answered an error'}`);
+                return report('failed', answer.text ?? 'CronCreate answered an error');
             current = { id: answer.result.id, wanted: wanted };
             await claude.store.set(storeKey, current.id);
         };
@@ -49,12 +49,12 @@ export function schedule(entry) {
             .get(storeKey)
             .then((left) => (typeof left === 'string' ? remove(left) : undefined))
             .then(update)
-            .catch((error) => log(`failed: ${messageOf(error)}`));
+            .catch((error) => report('failed', error));
         onStateChange(mod.state, () => {
             if (isQueued)
                 return;
             isQueued = true;
-            updates = updates.then(update).catch((error) => log(`failed: ${messageOf(error)}`));
+            updates = updates.then(update).catch((error) => report('failed', error));
         });
         job.announce(typeof entry === 'function' ? 'a schedule from its state' : `a schedule at ${entry.cron}`);
     };