@cmodjs/core 1.0.0 → 1.5.1

package/runtime/grants.js

@@ -1,7 +1,7 @@
-import { permissionWords } from '../records.js';
+import { isObject, permissionWords } from '../records.js';
 import { relativePath } from '../utils/paths.js';
 import { cmodPluginName } from './dependencies.js';
-import { conversationMethods } from './sessions.js';
+import { actPermission, conversationMethods, isAct, toolPermission } from './sessions.js';
 export class PermissionRefused extends Error {
 }
 const addressesOfPrograms = new WeakMap();
@@ -11,8 +11,6 @@ export function programAddresses(mod) {
     return known;
 }
 const projectSettingsFiles = ['.claude/settings.json', '.claude/settings.local.json', '.mcp.json'];
-const startsTurns = ['CronCreate'];
-const ownSchedule = ['CronDelete', 'CronList'];
 const conversationCalls = {
     [conversationMethods.sessions]: 'sessions.list',
     [conversationMethods.search]: 'sessions.search',
@@ -23,7 +21,8 @@ const conversationCalls = {
     [conversationMethods.goal]: 'goal',
     [conversationMethods.updateGoal]: 'goal.update',
     [conversationMethods.subscribe]: 'on',
-    [conversationMethods.send]: 'send',
+    [conversationMethods.watchBefore]: 'before',
+    [conversationMethods.act]: 'act',
 };
 export async function checkGrant(grants, call, item) {
     if (item === undefined)
@@ -95,8 +94,10 @@ export function checkingGrants(claude, grants) {
         cmod: {
             async call(args) {
                 const named = args.to === cmodPluginName ? conversationCalls[args.method] : undefined;
+                const given = args.method === conversationMethods.act && isObject(args.input) ? String(args.input['action']) : undefined;
+                const action = given !== undefined && isAct(given) ? given : undefined;
                 if (named !== undefined)
-                    await gate(named, args.method === conversationMethods.send ? 'prompt' : 'conversation');
+                    await gate(action ?? named, action === undefined ? 'conversation' : actPermission(action, isObject(args.input) ? args.input['input'] : undefined));
                 return claude.cmod.call(args);
             },
         },
@@ -116,8 +117,7 @@ export function checkingGrants(claude, grants) {
         tool: {
             ...claude.tool,
             call: async (input) => {
-                const item = startsTurns.includes(input.tool) ? 'prompt' : ownSchedule.includes(input.tool) ? undefined : 'tools';
-                await gate(`tool.call(${input.tool})`, item);
+                await gate(`tool.call(${input.tool})`, toolPermission(input.tool));
                 return claude.tool.call(input);
             },
         },

package/runtime/hooks.d.ts

@@ -3,7 +3,7 @@ import type { Claude } from './claude.js';
 import type { RoutedHook } from './router.js';
 import type { Failure } from './toaster.js';
 import { type ToolCalls } from './tool-calls.js';
-export type RoutedEvent = `classic.${Exclude<Hook, 'PreToolUse'>}` | 'tool.check' | 'tool.call' | 'prompt.submit' | 'prompt.context' | 'command.run' | 'session.measure' | 'skill.prompt' | 'ui.render' | 'ui.press' | 'ui.scroll' | 'ui.close' | 'cmod.call' | 'session.append' | 'session.compact' | 'session.receive' | 'agent.spawn';
+export type RoutedEvent = `classic.${Exclude<Hook, 'PreToolUse'>}` | 'tool.check' | 'tool.call' | 'prompt.submit' | 'prompt.context' | 'prompt.attachment' | 'command.run' | 'session.measure' | 'skill.prompt' | 'ui.render' | 'ui.press' | 'ui.scroll' | 'ui.close' | 'cmod.call' | 'session.append' | 'session.compact' | 'session.receive' | 'agent.spawn';
 export declare const permissionEvents: readonly RoutedEvent[];
 export declare function classicHook<E extends Exclude<Hook, 'PreToolUse'>>(name: string, event: E, hook: HookListener<E>, claude: Claude, calls: ToolCalls, report: (failure: Failure) => void): RoutedHook<RoutedEvent>;
 type HeldDecision = {

package/runtime/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/runtime/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAyB,YAAY,EAAE,MAAM,WAAW,CAAA;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3E,MAAM,MAAM,WAAW,GACnB,WAAW,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,GACxC,YAAY,GACZ,WAAW,GACX,eAAe,GACf,gBAAgB,GAChB,aAAa,GACb,iBAAiB,GACjB,cAAc,GACd,WAAW,GACX,UAAU,GACV,WAAW,GACX,UAAU,GACV,WAAW,GACX,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,aAAa,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,SAAS,WAAW,EAAgD,CAAA;AA6BnG,wBAAgB,WAAW,CAAC,CAAC,SAAS,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAuB/M;AAED,KAAK,YAAY,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpF,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;AAErD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CA6BzK;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC,CAM9E;AAYD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,CAexE;AAgED,eAAO,MAAM,UAAU,YAAI,OAAO,EAAE,KAAK,EAAE,MAAM,CAAU,CAAA"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/runtime/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAyB,YAAY,EAAE,MAAM,WAAW,CAAA;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3E,MAAM,MAAM,WAAW,GACnB,WAAW,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,GACxC,YAAY,GACZ,WAAW,GACX,eAAe,GACf,gBAAgB,GAChB,mBAAmB,GACnB,aAAa,GACb,iBAAiB,GACjB,cAAc,GACd,WAAW,GACX,UAAU,GACV,WAAW,GACX,UAAU,GACV,WAAW,GACX,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,aAAa,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,SAAS,WAAW,EAAgD,CAAA;AA4CnG,wBAAgB,WAAW,CAAC,CAAC,SAAS,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAuB/M;AAED,KAAK,YAAY,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpF,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;AAErD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CA6BzK;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC,CAM9E;AAYD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,CAexE;AAgED,eAAO,MAAM,UAAU,YAAI,OAAO,EAAE,KAAK,EAAE,MAAM,CAAU,CAAA"}

package/runtime/hooks.js

@@ -7,24 +7,39 @@ import { messageOf } from '../utils/text.js';
 export const permissionEvents = ['tool.check', 'classic.PermissionRequest'];
 const flags = ['suppressOriginalPrompt', 'reloadSkills', 'retry'];
 const readFields = {
+    Setup: ['additionalContext'],
     SessionStart: ['additionalContext', 'initialUserMessage', 'sessionTitle', 'watchPaths', 'reloadSkills'],
     SessionEnd: [],
     UserPromptSubmit: ['additionalContext', 'sessionTitle', 'suppressOriginalPrompt'],
+    UserPromptExpansion: ['additionalContext', 'suppressOriginalPrompt'],
     InstructionsLoaded: [],
+    ConfigChange: [],
+    DirectoryAdded: [],
+    PreModelSwitch: ['permissionDecision', 'permissionDecisionReason'],
+    PostModelSwitch: ['additionalContext'],
     PreToolUse: ['additionalContext', 'permissionDecision', 'permissionDecisionReason', 'updatedInput'],
     PermissionRequest: ['decision'],
     PermissionDenied: ['retry'],
     PostToolUse: ['additionalContext', 'updatedToolOutput', 'updatedMCPToolOutput'],
     PostToolUseFailure: ['additionalContext'],
     PostToolBatch: ['additionalContext'],
+    MessageDisplay: ['displayContent'],
     SubagentStart: ['additionalContext'],
     SubagentStop: ['additionalContext'],
+    TaskCreated: [],
+    TaskCompleted: [],
+    TeammateIdle: [],
+    Elicitation: [],
+    ElicitationResult: [],
     Notification: [],
     PreCompact: [],
+    PostCompact: [],
     Stop: ['additionalContext'],
     StopFailure: [],
     CwdChanged: [],
     FileChanged: [],
+    WorktreeCreate: ['worktreePath'],
+    WorktreeRemove: [],
 };
 export function classicHook(name, event, hook, claude, calls, report) {
     const hookInputOf = async (e) => {
@@ -146,10 +161,10 @@ async function preToolUseInput(name, envelope, claude, agentOf) {
 }
 async function callFiles(name, claude, use, cwd) {
     try {
-        const home = await claude.env.home();
+        const [home, configRoot] = await Promise.all([claude.env.home(), claude.env.configHome()]);
         if (home === undefined)
             throw new Error('HOME is not set, so ~ in a path has no meaning.');
-        const { shell, reads, writes } = callEffects(use, { cwd, home, fs: claude.fs });
+        const { shell, reads, writes } = callEffects(use, { cwd, home, ...(configRoot === undefined ? {} : { configRoot }), fs: claude.fs });
         const known = (accesses) => accesses.map(({ path }) => path).filter((path) => shell === undefined || !dynamicPattern.test(path));
         const unchecked = (path) => (error) => {
             if (!isMissing(error))
@@ -192,11 +207,11 @@ function classicResult(event, answer) {
             throw unread(`hookSpecificOutput.${field}`);
         if (field === 'additionalContext')
             result['additionalContext'] = [value];
-        else if (field === 'permissionDecision') {
+        else if (field === 'permissionDecision' && event === 'PreToolUse') {
             const reason = specific.permissionDecisionReason ?? '';
             result[value] = value === 'allow' ? true : reason;
         }
-        else if (field !== 'permissionDecisionReason')
+        else if (field !== 'permissionDecisionReason' || event !== 'PreToolUse')
             result[field] = value;
     }
     return result;

package/runtime/installer.d.ts

@@ -3,7 +3,7 @@ import type { Step } from '../installer.js';
 import type { Mod } from '../mod.js';
 import type { Option } from '../options.js';
 import type { Claude } from './claude.js';
-export declare const installerPaneId = "cmod-installer";
+export declare const installerPaneOf: (name: string) => string;
 export type Consent = {
     readonly install: string;
     readonly uninstall: string;

package/runtime/installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../src/runtime/installer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAI3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,eAAO,MAAM,eAAe,mBAAmB,CAAA;AAE/C,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AAOD,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAA;IAC5C,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,aAAa,CAAA;IACjD,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7I,IAAI,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9G,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB,CAAA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,GAAG,SAAS,CAuI7E"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../src/runtime/installer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAI3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAA0E,CAAA;AAEzH,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AAOD,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAA;IAC5C,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,aAAa,CAAA;IACjD,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7I,IAAI,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9G,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB,CAAA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,GAAG,SAAS,CAwI7E"}

package/runtime/installer.js

@@ -1,8 +1,9 @@
 import { permissionWords } from '../records.js';
 import { Box, Button, drawWith, Input, Text } from '../ui/elements.js';
 import { messageOf } from '../utils/text.js';
-export const installerPaneId = 'cmod-installer';
+export const installerPaneOf = (name) => `installer-${name.replace(/[^A-Za-z0-9_-]/g, '_')}`.slice(0, 64);
 export function createInstaller(name, claude) {
+    const paneId = installerPaneOf(name);
     let page;
     let isOpen = false;
     const show = async (build, cancelled) => {
@@ -18,7 +19,7 @@ export function createInstaller(name, claude) {
         });
         if (!isOpen) {
             isOpen = true;
-            await claude().ui.open({ id: installerPaneId, title: `Install ${name}`, focus: true, holdToasts: true, closeOnEscape: true });
+            await claude().ui.open({ id: paneId, title: `Install ${name}`, focus: true, holdToasts: true, closeOnEscape: true });
         }
         claude().ui.invalidate('ui.render');
         return answer;
@@ -26,12 +27,12 @@ export function createInstaller(name, claude) {
     const frame = (title, body, actions) => Box({ flexDirection: 'column', gap: 1, paddingX: 1, children: [Text({ bold: true, children: title }), ...body, Box({ gap: 3, children: actions })] });
     const bullet = (text) => Text({ children: [Text({ color: 'claude', children: '◆ ' }), text] });
     return {
-        draws: (e) => e.component === 'Pane' && e.requestId === installerPaneId,
+        draws: (e) => e.component === 'Pane' && e.requestId === paneId,
         draw(e) {
             return drawWith(claude().ui.resolve(e), () => page?.draw(e.props) ?? Text({ dimColor: true, children: `${name} is installing.` }));
         },
         closed(id) {
-            if (id !== installerPaneId)
+            if (id !== paneId)
                 return;
             isOpen = false;
             page?.cancel();
@@ -114,7 +115,7 @@ export function createInstaller(name, claude) {
             if (!isOpen)
                 return;
             isOpen = false;
-            await claude().ui.close({ id: installerPaneId });
+            await claude().ui.close({ id: paneId });
         },
     };
 }

package/runtime/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/runtime/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAc,aAAa,EAAiB,MAAM,aAAa,CAAA;AAEtG,OAAO,EAAkI,KAAK,GAAG,EAAE,KAAK,aAAa,EAAkD,MAAM,WAAW,CAAA;AACxO,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,eAAe,CAAA;AAC1D,OAAO,EAA2T,KAAK,KAAK,EAAE,MAAM,eAAe,CAAA;AAGnW,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAOzC,OAAO,EAAsG,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AAOjJ,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAKxE,OAAO,EAA4C,KAAK,UAAU,EAAgB,MAAM,cAAc,CAAA;AAMtG,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAA;AAEtG,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI;IAC5C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAA;IACtC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/E,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;CACzG,CAAA;AAsCD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBhE;AAkCD,wBAAgB,eAAe,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,OAAO,GAAG,OAAO,EACtF,UAAU,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAClD,iBAAiB,GAAE,MAAM,OAAoB,EAC7C,OAAO,GAAE,aAAkB,EAC3B,UAAU,UAAO,GAChB,SAAS,CAAC,KAAK,CAAC,CA6YlB"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/runtime/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAc,aAAa,EAAwB,MAAM,aAAa,CAAA;AAE7G,OAAO,EAAkI,KAAK,GAAG,EAAE,KAAK,aAAa,EAAkD,MAAM,WAAW,CAAA;AACxO,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,eAAe,CAAA;AAC1D,OAAO,EAA2T,KAAK,KAAK,EAAE,MAAM,eAAe,CAAA;AAGnW,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAOzC,OAAO,EAAsG,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AAOjJ,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAMxE,OAAO,EAA+B,KAAK,UAAU,EAAgB,MAAM,cAAc,CAAA;AAMzF,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAA;AAEtG,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI;IAC5C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAA;IACtC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/E,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;CACzG,CAAA;AAwCD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBhE;AAkCD,wBAAgB,eAAe,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,OAAO,GAAG,OAAO,EACtF,UAAU,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAClD,iBAAiB,GAAE,MAAM,OAAoB,EAC7C,OAAO,GAAE,aAAkB,EAC3B,UAAU,UAAO,GAChB,SAAS,CAAC,KAAK,CAAC,CAkclB"}

package/runtime/lifecycle.js

@@ -1,12 +1,12 @@
 import { hooks, PreToolUse } from '../mod.js';
 import { changelogPage, consentPath, dataFolder, finishStepsMethod, isAtLeast, marketplaceOf, oldestCmodFor, openPageMethod, parseConsent, pendingStepsMethod, parseEvent, permissionWords, readRecord, readSteps, recordPath, scriptsSha256, settingsPagesMethod, storeFolder, updatesToTurnOn } from '../records.js';
-import { ifMissing, relativePath } from '../utils/paths.js';
+import { homePrefix, ifMissing, relativePath } from '../utils/paths.js';
 import { firstLine, formatExit, listed, messageOf } from '../utils/text.js';
 import { beforeDeadline } from './deadline.js';
 import { announcedOf, announcementMs, announcementOf } from './announce.js';
 import { bind } from './bound.js';
 import { serveConversations } from './conversations.js';
-import { answerCall, cmodPluginName, dependencyCalls, notInstalled, withBareRefusals } from './dependencies.js';
+import { answerCall, cmodPluginName, dependencyCalls, withBareRefusals } from './dependencies.js';
 import { keepEngine } from './engine.js';
 import { classicHook, heldDecisionHook, permissionEvents, preToolUseHook, userSkillHook } from './hooks.js';
 import { checkedAnswer, checkingGrants, checkSettings, checksAnswers, checkWrite, isCovered, itemOf, passedDown, programAddresses } from './grants.js';
@@ -19,13 +19,14 @@ import { createRouter } from './router.js';
 import { conversationMethods, createSessionsClient } from './sessions.js';
 import { matches } from '../utils/matcher.js';
 import { createState } from './state.js';
-import { createToaster, showFailure } from './toaster.js';
+import { createToaster } from './toaster.js';
 import { toolCalls } from './tool-calls.js';
 import { createUi } from './ui.js';
 import { Progress } from '../ui/components.js';
 import { Box, Text } from '../ui/elements.js';
 const announcedKey = 'cmod:announced';
 const installId = 'cmod:install';
+const installRetrySeconds = [2, 4, 8, 16, 32, 64, 128];
 const cmodCheckMs = 1000;
 const cmodWaitMs = 60_000;
 const startHoldMs = 10_000 - 1_000;
@@ -77,7 +78,7 @@ async function readJson(read, path) {
         return JSON.parse(text);
     }
     catch (error) {
-        throw new Error(`${path} is not JSON (${messageOf(error)}). Fix the file, then run /reload-plugins.`);
+        throw new Error(`${path} is not JSON (${messageOf(error)}). Fix it, then press Retry.`);
     }
 }
 async function cmodVersion(claude) {
@@ -116,15 +117,52 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         return runtime.claude;
     };
     const installing = (description) => runtime?.toaster.toast.loading('Installing', { id: installId, ...(description === undefined ? {} : { description }) });
-    const toastFailure = (shown) => {
-        if (runtime !== undefined)
-            showFailure({ name: definition.name, ui: runtime.toaster, claude: runtime.claude }, shown);
-    };
+    const toastFailure = (shown) => runtime?.toaster.fail(shown);
     const fail = (reason, fix, retry) => {
         phase = 'failed';
-        failure ??= new Error(`${definition.name}: ${reason}${/[.!?]$/.test(reason) ? '' : '.'} ${fix}`);
-        const action = retry === undefined ? {} : { action: { label: 'Retry', onClick: () => ((failure = undefined), retry().catch(report)) } };
-        runtime?.toaster.toast.error(reason, { id: installId, description: fix, duration: Infinity, ...action });
+        failure ??= new Error(`${definition.name}: ${reason}${/[.!?]$/.test(reason) ? '' : '.'}${fix === undefined ? '' : ` ${fix}`}`);
+        const again = retry === undefined ? {} : { retry: () => ((failure = undefined), stopRetrying(), retry().catch(report)) };
+        toastFailure({ id: installId, message: reason, ...(fix === undefined ? {} : { description: fix }), ...again });
+    };
+    let consented;
+    const installAgain = () => install(consented);
+    let retrying;
+    const retryLater = (next) => {
+        const seconds = installRetrySeconds[Math.min(next.tries, installRetrySeconds.length - 1)];
+        retrying?.timer.cancel();
+        retrying = { ...next, tries: next.tries + 1, timer: claude().clock.after(seconds * 1000, () => void retryInBackground().catch(report)) };
+        fail(next.reason, `Trying again in ${seconds} s.`, installAgain);
+    };
+    const stopRetrying = () => {
+        retrying?.timer.cancel();
+        retrying = undefined;
+    };
+    const checkoutState = async () => {
+        if (plugin === undefined)
+            return undefined;
+        const lines = [];
+        const { code } = await readLines(claude().process.spawn({ argv: ['sh', '-c', 'git rev-parse HEAD && git status --porcelain=v1 -uall && git diff HEAD'], cwd: plugin.root }), (text) => void lines.push(text));
+        return code === 0 ? lines.join('\n') : undefined;
+    };
+    const failInstall = async (reason, when) => {
+        if (when === undefined) {
+            stopRetrying();
+            return fail(reason, undefined, installAgain);
+        }
+        retryLater({ when, tries: retrying?.when === when ? retrying.tries : 0, checkout: when === 'changed' ? await checkoutState() : undefined, reason });
+    };
+    const retryInBackground = async () => {
+        const waiting = retrying;
+        if (phase !== 'failed' || waiting === undefined)
+            return;
+        if (await recover()) {
+            stopRetrying();
+            return whenActive();
+        }
+        if (waiting.when === 'changed' && waiting.checkout !== undefined && (await checkoutState()) === waiting.checkout)
+            return retryLater(waiting);
+        await install(consented, true);
+        await whenActive();
     };
     const finish = async () => {
         await programs?.refresh();
@@ -215,7 +253,7 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         const active = await createMod(definition, { ...runtime, router: activeRouter, dataFolder: dataFolder(plugin.store, plugin.name), store: plugin.store, steps: plugin.steps, granted, refreshGrants, checksPermissions, options: pluginOptions }).catch(async (error) => {
             if (error instanceof MissingOptions && (await askOptions(error)))
                 return undefined;
-            fail(messageOf(error), error instanceof MissingOptions ? `Set ${error.keys.length === 1 ? 'it' : 'them'} in /config.` : 'Fix it, then run /reload-plugins.');
+            fail(messageOf(error), error instanceof MissingOptions ? `Set ${error.keys.length === 1 ? 'it' : 'them'} in /config.` : undefined, begin);
             throw error;
         });
         if (active === undefined)
@@ -263,18 +301,21 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             claude().ui.log(`${name} waits for consent to run ${event.install}. Run cmod install ${name} in a terminal.`);
             return;
         }
-        installing('Waiting for your answer');
+        runtime?.toaster.toast.info('Installing', { id: installId, description: 'Waiting for your answer', duration: Infinity });
         const updates = await updatesToShow().catch((error) => {
             toastFailure({ id: 'cmod:updates', message: 'Could not read whether its marketplace updates automatically', error });
             return undefined;
         });
-        if (await installer.consent({ ...event, updates }))
-            return install(event.sha256);
+        const isAccepted = await installer.consent({ ...event, updates });
         await installer.close();
+        if (isAccepted) {
+            consented = event.sha256;
+            return install(consented);
+        }
         phase = 'declined';
-        runtime?.toaster.toast('Not installed', { id: installId, description: `Run cmod install ${name} to install it.` });
+        runtime?.toaster.toast('Not installed', { id: installId, description: 'Install it whenever you like.', duration: Infinity, action: { label: 'Install', onClick: () => install().catch(report) } });
     };
-    const install = async (consent) => {
+    const install = async (consent, isQuiet = false) => {
         if (plugin === undefined)
             return;
         if (plugin.name === cmodPluginName)
@@ -283,25 +324,29 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         const found = await cmodVersion(claude());
         if (!fits(found))
             return waitForcmod(found);
-        installing();
+        if (!isQuiet)
+            installing();
         let outcome;
+        let retries;
         const argv = ['cmod', 'setup', plugin.root, '--events', ...(consent === undefined ? [] : ['--consent', consent])];
         const { code, lastError } = await readLines(claude().process.spawn({ argv }), (text) => {
             const event = parseEvent(text);
-            if (event.type === 'progress')
+            if (event.type === 'progress' && !isQuiet)
                 installing(progressOf(event));
+            if (event.type === 'retries')
+                retries = event.when;
             if (event.type === 'done' || event.type === 'failed' || event.type === 'needs-consent')
                 outcome = event;
         });
         if (outcome?.type === 'done') {
+            stopRetrying();
             for (const item of plugin.steps.permissions ?? [])
                 granted.add(item);
             return finish();
         }
         if (outcome?.type === 'needs-consent')
             return askConsent(outcome);
-        const reason = outcome?.type === 'failed' ? outcome.message : `cmod setup ${formatExit(code, lastError)}`;
-        fail(reason, `Fix the cause, then retry, or run cmod install ${definition.name} in a terminal.`, install);
+        return failInstall(outcome?.type === 'failed' ? outcome.message : `cmod setup ${formatExit(code, lastError)}`, retries);
     };
     const fits = (found) => found !== undefined && isAtLeast(found, oldestCmodFor(plugin?.steps ?? {}));
     const waitForcmod = (found) => {
@@ -342,12 +387,32 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         });
         if (code === 0)
             return finish();
-        fail(`bootstrap ${formatExit(code, lastError)}`, `Run ./setup/bootstrap.sh in ${root} to see the whole log.`, () => bootstrap(root));
+        fail(`bootstrap ${formatExit(code, lastError)}`, undefined, () => bootstrap(root));
+    };
+    const begin = async () => {
+        if (readStarted === undefined)
+            return;
+        const started = await readStarted(claude());
+        plugin = started;
+        for (const item of started.granted)
+            granted.add(item);
+        consentMs = await stampOf(consentPath(started.store));
+        recordMs = await stampOf(recordPath(started.store, started.name));
+        if (started.isInstalled) {
+            shouldRecord = started.shouldRecord;
+            if (shouldRecord)
+                record();
+            activation = undefined;
+            return activate();
+        }
+        if (started.version === undefined)
+            return fail('no version to install', 'Its author adds "version" to .claude-plugin/plugin.json.');
+        void install().catch(report);
     };
     const report = (error) => {
         failure = error;
         if (phase !== 'failed')
-            fail(messageOf(error), `Run cmod install ${definition.name} in a terminal to see the whole log.`);
+            fail(messageOf(error), undefined, begin);
     };
     let consentMs = 0;
     const stampOf = async (path) => {
@@ -358,19 +423,20 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
     let readStarted;
     const recover = async () => {
         if (plugin === undefined || readStarted === undefined || (phase !== 'failed' && phase !== 'declined'))
-            return;
+            return false;
         const modifiedMs = await stampOf(recordPath(plugin.store, plugin.name));
         if (modifiedMs === recordMs)
-            return;
+            return false;
         recordMs = modifiedMs;
         const current = await readStarted(claude());
         if (!current.isInstalled)
-            return;
+            return false;
         plugin = current;
         failure = undefined;
         activation = undefined;
         await refreshGrants();
         await finish();
+        return true;
     };
     const refreshGrants = async () => {
         if (plugin === undefined || plugin.name === cmodPluginName)
@@ -440,30 +506,11 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             if (runtime !== undefined)
                 return;
             programs = locatingPrograms(claudeCalls);
-            runtime = { claude: programs.claude, toaster: createToaster(claudeCalls, definition.name) };
+            runtime = { claude: programs.claude, toaster: createToaster(claudeCalls, definition.name, () => plugin?.version) };
+            readStarted = read;
             try {
                 await programs.refresh();
-                const started = await read(claudeCalls).catch((error) => {
-                    report(error);
-                    return undefined;
-                });
-                if (started === undefined)
-                    return;
-                plugin = started;
-                readStarted = read;
-                for (const item of started.granted)
-                    granted.add(item);
-                consentMs = await stampOf(consentPath(started.store));
-                recordMs = await stampOf(recordPath(started.store, started.name));
-                if (started.isInstalled) {
-                    shouldRecord = started.shouldRecord;
-                    if (shouldRecord)
-                        record();
-                    return await activate().catch(report);
-                }
-                if (started.version === undefined)
-                    return fail('no version to install', 'Add "version" to .claude-plugin/plugin.json, then run /reload-plugins.');
-                void install().catch(report);
+                await begin().catch(report);
             }
             finally {
                 settleStart();
@@ -487,12 +534,14 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             if (event === 'classic.UserPromptSubmit' || event === 'classic.SessionStart')
                 await recover().catch((error) => claude().ui.log(`${definition.name} stays stopped: ${messageOf(error)}`, { to: 'debug' }));
             const isCallToThisMod = event === 'cmod.call' && e.to === definition.name;
+            if (event === 'cmod.call' && !isCallToThisMod)
+                return next(e);
             await (event === 'classic.SessionStart' || isCallToThisMod ? holdUntilStarted() : whenActive());
             if (event === 'classic.SessionStart' && phase !== 'active')
                 missedSessionStart = e;
             if (isCallToThisMod && phase !== 'active') {
                 const isStopped = phase === 'declined' || phase === 'failed';
-                return { deny: isStopped ? notInstalled(definition.name) : `${definition.name} is installing. Try again when it's ready.` };
+                return { deny: isStopped ? `${definition.name} is not set up. Its toast says why.` : `${definition.name} is installing. Try again when it's ready.` };
             }
             const call = e;
             if (event === 'cmod.call' && call.to === definition.name && mod !== undefined) {
@@ -503,19 +552,19 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             }
             if (event === 'classic.UserPromptSubmit' || event === 'classic.SessionStart')
                 await refreshGrants().catch((error) => claude().ui.log(`${definition.name} keeps its grants from before: ${messageOf(error)}`, { to: 'debug' }));
-            if (checksAnswers(event) && phase === 'active')
+            if (checksAnswers(event) && phase === 'active' && definition.name !== cmodPluginName)
                 return checkedRoute(event, e, next);
             const answer = router.dispatch(event, e, next);
             const render = e;
             if (event !== 'ui.render' || render.component !== 'AbovePrompt' || runtime === undefined)
                 return answer;
-            return runtime.toaster.draw((await answer), runtime.claude.ui.resolve(render), render.props);
+            return runtime.toaster.draw((await answer), runtime.claude.ui.resolve(render), render.props, render.requestId);
         },
     };
 }
 async function createMod(definition, runtime) {
     const { router, toaster } = runtime;
-    const report = (failure) => void showFailure({ name: definition.name, ui: toaster, claude: runtime.claude }, failure);
+    const report = (failure) => void toaster.fail(failure);
     const claude = withBareRefusals(checkingKeys(runtime.claude, toaster.toast, runtime.steps.keys ?? {}));
     const added = [];
     const hooksAdded = [];
@@ -571,6 +620,7 @@ async function createMod(definition, runtime) {
     let forkedFrom;
     let parentAsked;
     let hasEarlierPrompts = true;
+    let agentType;
     const area = createUi({ name: definition.name, claude, router, toaster, report, announce, mod: () => mod });
     const askParent = async () => {
         if (definition.name === cmodPluginName)
@@ -591,7 +641,7 @@ async function createMod(definition, runtime) {
     const modState = createState({ name: definition.name, initial: definition.state ?? {}, session, root, claude, report, changed: area.changed, forkParent });
     const modOptions = createOptions({ name: definition.name, declared: definition.options ?? {}, fromClaude: runtime.options, claude, report, changed: modState.changed });
     const held = runtime.checksPermissions() ? new Map() : undefined;
-    const expand = (path) => (path === '~' || path.startsWith('~/') ? resolvedPath(path, places) : path);
+    const expand = (path) => (homePrefix.test(path) ? resolvedPath(path, places) : path);
     const settingsFile = (source) => ({
         read: () => checked.settings.read({ source }),
         async update(values) {
@@ -599,7 +649,7 @@ async function createMod(definition, runtime) {
             await claude.cmod.call({ to: cmodPluginName, method: 'updateSettings', input: { mod: definition.name, source, project: modState.root, values } });
         },
     });
-    const client = createSessionsClient({ name: definition.name, claude: checked, report: (id, message, error) => report({ id, message, error }) });
+    const client = createSessionsClient({ name: definition.name, claude: checked, report: (id, message, error) => report({ id, message, error }), isGranted: (permission) => flag(permission) });
     let followed;
     const followFolders = (project, folder) => {
         if (followed === undefined)
@@ -609,7 +659,21 @@ async function createMod(definition, runtime) {
     };
     const imports = {
         sessions: client.sessions,
-        settings: { user: settingsFile('user'), project: settingsFile('project'), local: settingsFile('local') },
+        settings: {
+            list: async () => (await checked.config.list()).map(({ key, label, description, kind, value, options, provider, isLocked }) => ({
+                key,
+                label,
+                kind,
+                value,
+                isLocked,
+                ...(description === undefined ? {} : { description }),
+                ...(options === undefined ? {} : { options }),
+                ...(provider.plugin === 'engine' ? {} : { plugin: provider.plugin }),
+            })),
+            user: settingsFile('user'),
+            project: settingsFile('project'),
+            local: settingsFile('local'),
+        },
         model: { complete: (completion, options) => checked.model.complete(completion, options) },
         fs: {
             read: (path) => checked.fs.read(expand(path)),
@@ -745,10 +809,11 @@ async function createMod(definition, runtime) {
     };
     const followCurrent = async (title) => {
         const [id, model, usage] = await Promise.all([claude.session.id(), claude.session.model(), claude.session.usage()]);
-        followed = { id, title: title ?? '', project: modState.root, cwd, model, startedAt: new Date(usage.startedAt).toISOString(), ...(forkedFrom === undefined ? {} : { forkedFrom }) };
+        followed = { id, title: title ?? '', project: modState.root, cwd, model, startedAt: new Date(usage.startedAt).toISOString(), ...(forkedFrom === undefined ? {} : { forkedFrom }), ...(agentType === undefined ? {} : { agentType }) };
         client.follow(followed);
     };
     router.add('classic.SessionStart', async (e, next) => {
+        agentType = e.agent_id === undefined ? e.agent_type : agentType;
         const previous = followed?.id;
         if (e.source === 'fork' && previous !== undefined && previous !== e.session_id)
             forkedFrom = previous;
@@ -779,8 +844,10 @@ async function createMod(definition, runtime) {
     }
     router.add('command.run', async (e, next) => {
         const answer = await next(e);
-        if (e.command === 'cd')
+        if (e.command === 'cd') {
             await followSession(true);
+            conversations?.moved();
+        }
         return answer;
     });
     router.add('skill.prompt', userSkillHook(claude));
@@ -793,10 +860,14 @@ async function createMod(definition, runtime) {
         if (e.method === conversationMethods.changed && call.caller === cmodPluginName) {
             if (!flag('conversation'))
                 return { value: null };
-            const { session: changedSession, change } = e.input;
-            client.changed(changedSession, change);
+            const { session: changedSession, change, isInProject } = e.input;
+            client.changed(changedSession, change, isInProject !== false);
             return { value: null };
         }
+        if (e.method === conversationMethods.before && call.caller === cmodPluginName) {
+            const { session: asking, event, change, isInProject } = e.input;
+            return { value: (await client.answerBefore(asking, event, change, isInProject !== false)) ?? null };
+        }
         if (e.method === settingsPagesMethod)
             return { value: [...pages].map(([id, { title }]) => ({ id, title })) };
         if (e.method === openPageMethod) {

package/runtime/metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../src/runtime/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAKpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,MAAM,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAAA;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACxF,CAAA;AAUD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAQjE;AAED,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpD,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC5C,GAAG,QAAQ,CA4HX"}
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../src/runtime/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAKpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,MAAM,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAAA;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACxF,CAAA;AAUD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CASjE;AAED,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpD,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC5C,GAAG,QAAQ,CA4HX"}

package/runtime/metadata.js

@@ -1,5 +1,5 @@
 import { formatOf, MetadataError, readMetadata, sidecarSuffix, writeMetadata } from '../utils/metadata.js';
-import { ifMissing, isMissing } from '../utils/paths.js';
+import { expandHome, homePrefix, ifMissing, isMissing } from '../utils/paths.js';
 import { messageOf } from '../utils/text.js';
 import { picomatch, resolve } from '../vendor.js';
 const skippedFolders = ['.git', 'node_modules'];
@@ -8,10 +8,11 @@ export function resolvedPath(path, places) {
     const configured = /^~\/\.claude(?=\/|$)/.exec(path);
     if (configured !== null && places.configRoot !== undefined)
         return resolve(`${places.configRoot}${path.slice(configured[0].length)}`);
-    if (path === '~' || path.startsWith('~/')) {
+    const prefix = homePrefix.exec(path)?.[0];
+    if (prefix !== undefined) {
         if (places.home === undefined)
-            throw new Error(`${path} starts with ~, and HOME is not set. Start Claude Code with HOME set.`);
-        return resolve(`${places.home}${path.slice(1)}`);
+            throw new Error(`${path} starts with ${prefix}, and HOME is not set. Start Claude Code with HOME set.`);
+        return resolve(expandHome(path, places.home, places.configRoot));
     }
     return path.startsWith('/') ? resolve(path) : resolve(places.projectRoot(), path);
 }