@cmodjs/core 0.1.8 → 0.1.10

package/testing.js

@@ -1,8 +1,9 @@
 import { storeFolder } from './records.js';
 import { answerCall, notInstalled } from './runtime/dependencies.js';
+import { toolInputOf } from './runtime/tool-calls.js';
 import { createLifecycle } from './runtime/lifecycle.js';
 import { fakeClaude } from './testing/fake-claude.js';
-import { elements, findButton, rowsOf } from './testing/fake-elements.js';
+import { elements, findElement, rowsOf } from './testing/fake-elements.js';
 import { fakeFiles } from './testing/fake-files.js';
 const defaultColumns = 80;
 const defaultRows = 24;
@@ -24,6 +25,13 @@ export function testMod(definition, options = {}) {
     fake.claude.session.root = async () => projectRoot;
     fake.claude.session.cwd = async () => cwd;
     fake.fakes.cmod.call = fakeDependencies(options.dependencies ?? {});
+    const firedAgents = new Map();
+    const listAgents = fake.claude.agent.list;
+    fake.claude.agent.list = async () => {
+        if (fake.fakes.agent.list !== undefined || firedAgents.size === 0)
+            return listAgents();
+        return [...firedAgents].map(([id, type]) => ({ id, type, description: '', status: 'running' }));
+    };
     Object.assign(fake.fakes.fs, fakeFiles(options.files ?? {}));
     const starting = options.state;
     const declared = Object.entries(definition.state ?? {});
@@ -55,10 +63,18 @@ export function testMod(definition, options = {}) {
         }
         const opened = fake.calls.findLast((call) => call.call === 'ui.open' && call.args[0].id === paneId)?.args[0];
         const columns = opened?.columns ?? defaultColumns;
-        const props = { title: opened?.title ?? paneId, isFocused: false, bodyColumns: columns, placement: 'dock', scroll: { offset: 0, bodyRows: defaultRows }, view: {} };
+        const isFocused = (await fake.claude.ui.panes()).some((open) => open.id === paneId && open.isFocused);
+        const props = { title: opened?.title ?? paneId, isFocused, bodyColumns: columns, placement: 'dock', scroll: { offset: 0, bodyRows: defaultRows }, view: {} };
         const drawing = await route('ui.render', { surface: 'terminal', component: 'Pane', requestId: paneId, props }, elements.Box({}));
         return { drawing, columns };
     };
+    const drawnElement = async (paneId, type, key) => {
+        const props = findElement((await drawPane(paneId)).drawing, type, key);
+        if (props === undefined)
+            throw new Error(`The pane "${paneId}" of ${name} draws no ${type} with the ${type === 'Button' ? 'key or label' : 'key'} "${key}".`);
+        return props;
+    };
+    const eventIn = (paneId, key) => ({ plugin: name, element: key, component: 'Pane', requestId: paneId, surface: 'terminal' });
     const drawSlot = async (component, props, requestId = `${component}_${(slotDraws += 1)}`) => {
         await start();
         const input = { surface: 'terminal', component, requestId, props };
@@ -78,9 +94,29 @@ export function testMod(definition, options = {}) {
         const filled = { session_id: sessionId, transcript_path: '/test/transcript.jsonl', cwd, hook_event_name: event, ...toolUse, ...input };
         if (event !== 'PreToolUse')
             return route(`classic.${event}`, filled, below);
-        const { tool_name, tool_input, tool_use_id } = filled;
-        return route('classic.PreToolUse', { ...tool_input, tool: tool_name, tool_use_id }, below);
+        return firePreToolUse(filled, below);
     });
+    const firePreToolUse = async ({ tool_name, tool_input, tool_use_id, agent_id, agent_type }, below) => {
+        await start();
+        if (agent_id !== undefined && agent_type !== undefined)
+            firedAgents.set(agent_id, agent_type);
+        const envelope = { ...tool_input, tool: tool_name, tool_use_id, ...(agent_id === undefined ? {} : { agentId: agent_id }) };
+        const asks = below?.deny === undefined ? { decision: 'ask' } : { decision: 'deny', reason: below.deny };
+        let reached = envelope;
+        let check = asks;
+        const answer = await lifecycle.route('tool.call', envelope, async (e) => {
+            reached = e;
+            check = await lifecycle.route('tool.check', { tool: e.tool, input: toolInputOf(e), tool_use_id: e.tool_use_id, ...(e.agentId === undefined ? {} : { agentId: e.agentId }) }, async () => asks);
+            return (check.decision === 'deny' ? { deny: check.reason ?? '' } : { result: '' });
+        });
+        const updatedInput = toolInputOf(reached);
+        const decided = check === asks ? {} : check.decision === 'allow' ? { allow: true } : check.decision === 'ask' ? { ask: check.reason ?? '' } : {};
+        return {
+            ...(answer.deny === undefined ? decided : { deny: answer.deny }),
+            ...(JSON.stringify(updatedInput) === JSON.stringify(tool_input) ? {} : { updatedInput }),
+            ...(answer.context === undefined || answer.context.length === 0 ? {} : { additionalContext: [...answer.context] }),
+        };
+    };
     return {
         start,
         fire,
@@ -114,11 +150,31 @@ export function testMod(definition, options = {}) {
                 throw new Error(`${name} has no tool ${toolName}. Add it in setup with mod.use(tool({ name: '${toolName}', … })).`);
             return answer;
         },
-        async press(paneId, key) {
-            const button = findButton((await drawPane(paneId)).drawing, key);
-            if (button === undefined)
-                throw new Error(`The pane "${paneId}" of ${name} draws no Button with the key or label "${key}".`);
-            await button.props.onPress();
+        async press(paneId, key, link) {
+            const props = await drawnElement(paneId, link === undefined ? 'Button' : 'Markdown', key);
+            if (link !== undefined && props['onLinkPress'] === undefined)
+                throw new Error(`The Markdown "${key}" in the pane "${paneId}" of ${name} has no onLinkPress, so Claude Code opens its links itself.`);
+            const pressed = { ...eventIn(paneId, String(props['key'])), ...(link === undefined ? {} : { link: { href: link } }) };
+            await lifecycle.route('ui.press', pressed, async (e) => {
+                if (e.link === undefined)
+                    await props['onPress'](e);
+                else
+                    await props['onLinkPress'](e.link, e);
+                return { element: e.element };
+            });
+        },
+        async input(paneId, key, text, kind = 'submit') {
+            const props = await drawnElement(paneId, 'Input', key);
+            const typed = { ...eventIn(paneId, key), kind, value: text };
+            await props[kind === 'submit' ? 'onSubmit' : 'onInput']?.(text, typed);
+        },
+        async select(paneId, key, value) {
+            const props = await drawnElement(paneId, 'Select', key);
+            const options = props['options'].map((option) => option.value);
+            if (!options.includes(value))
+                throw new Error(`The Select "${key}" in the pane "${paneId}" of ${name} has no option "${value}". Its options are ${options.map((option) => `"${option}"`).join(', ')}.`);
+            const picked = { ...eventIn(paneId, key), value };
+            await props['onSelect'](value, picked);
         },
         async moveTo(nextRoot, nextCwd = nextRoot) {
             await start();

package/ui/components.d.ts

@@ -0,0 +1,48 @@
+import type { RenderChildren, RenderElement } from 'claude-code';
+export type Tab = {
+    readonly key: string;
+    readonly label: string;
+};
+export declare function Tabs({ tabs, selected, onSelect, children }: {
+    readonly tabs: readonly Tab[];
+    readonly selected: string;
+    readonly onSelect: (key: string) => void;
+    readonly children?: RenderChildren;
+}): RenderElement;
+export declare function Split({ children }: {
+    readonly children: readonly RenderElement[];
+}): RenderElement;
+export declare function Panel({ title, children }: {
+    readonly title: string;
+    readonly children?: RenderChildren;
+}): RenderElement;
+export declare function Toggle({ label, checked, onChange }: {
+    readonly label: string;
+    readonly checked: boolean;
+    readonly onChange: (checked: boolean) => void;
+}): RenderElement;
+export declare function Tooltip({ text, children }: {
+    readonly text: string;
+    readonly children?: RenderChildren;
+}): RenderElement;
+export declare function Help({ text, isOpen, onOpenChange }: {
+    readonly text: string;
+    readonly isOpen: boolean;
+    readonly onOpenChange: (isOpen: boolean) => void;
+}): RenderElement;
+export declare function Dialog({ title, children, actions }: {
+    readonly title: string;
+    readonly children?: RenderChildren;
+    readonly actions: RenderChildren;
+}): RenderElement;
+export declare function Pagination({ page, pages, onPage }: {
+    readonly page: number;
+    readonly pages: number;
+    readonly onPage: (page: number) => void;
+}): RenderElement;
+export declare function ProgressBar({ done, total, width }: {
+    readonly done: number;
+    readonly total: number;
+    readonly width?: number;
+}): RenderElement;
+//# sourceMappingURL=components.d.ts.map

package/ui/components.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../src/ui/components.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhE,MAAM,MAAM,GAAG,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAElE,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GAAG,aAAa,CAQtN;AAED,wBAAgB,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAA;CAAE,GAAG,aAAa,CAGlG;AAED,wBAAgB,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GAAG,aAAa,CAExH;AAED,wBAAgB,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG,aAAa,CAExK;AAED,wBAAgB,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GAAG,aAAa,CAExH;AAED,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG,aAAa,CAEzK;AAED,wBAAgB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG,aAAa,CAEpK;AAED,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GAAG,aAAa,CAS7J;AAED,wBAAgB,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,aAAa,CAGlJ"}

package/ui/components.js

@@ -0,0 +1,56 @@
+import { Box, Button, Text } from './elements.js';
+export function Tabs({ tabs, selected, onSelect, children }) {
+    const row = tabs.map((tab, index) => {
+        const hotkey = index < 9 ? `${index + 1}` : undefined;
+        return tab.key === selected
+            ? Text({ children: [...(hotkey === undefined ? [] : [Text({ color: 'claude', children: hotkey }), ': ']), Text({ bold: true, underline: true, children: tab.label })] })
+            : Button({ plain: true, dimColor: true, key: `tab:${tab.key}`, ...(hotkey === undefined ? {} : { hotkey }), label: tab.label, onPress: () => onSelect(tab.key) });
+    });
+    return Box({ flexDirection: 'column', gap: 1, children: [Box({ gap: 3, children: row }), children] });
+}
+export function Split({ children }) {
+    const width = `${Math.floor(100 / Math.max(children.length, 1))}%`;
+    return Box({ gap: 1, children: children.map((child) => Box({ width, children: child })) });
+}
+export function Panel({ title, children }) {
+    return Box({ flexDirection: 'column', flexGrow: 1, borderStyle: 'round', borderColor: 'subtle', paddingX: 1, children: [Text({ bold: true, children: title }), children] });
+}
+export function Toggle({ label, checked, onChange }) {
+    return Button({ plain: true, key: `toggle:${label}`, label: `${checked ? '[x]' : '[ ]'} ${label}`, onPress: () => onChange(!checked) });
+}
+export function Tooltip({ text, children }) {
+    return Box({ key: `tooltip:${text}`, children: [children, card(text, false)] });
+}
+export function Help({ text, isOpen, onOpenChange }) {
+    return Box({ key: `help:${text}`, children: [Button({ plain: true, key: `help-button:${text}`, label: '?', onPress: () => onOpenChange(!isOpen) }), card(text, isOpen)] });
+}
+export function Dialog({ title, children, actions }) {
+    return Box({ flexDirection: 'column', gap: 1, paddingX: 1, children: [Text({ bold: true, children: title }), children, Box({ gap: 2, children: actions })] });
+}
+export function Pagination({ page, pages, onPage }) {
+    return Box({
+        gap: 2,
+        children: [
+            page > 1 ? Button({ plain: true, hotkey: 'p', label: 'Previous', onPress: () => onPage(page - 1) }) : Text({ dimColor: true, children: 'p: Previous' }),
+            Text({ dimColor: true, children: `${page} of ${pages}` }),
+            page < pages ? Button({ plain: true, hotkey: 'n', label: 'Next', onPress: () => onPage(page + 1) }) : Text({ dimColor: true, children: 'n: Next' }),
+        ],
+    });
+}
+export function ProgressBar({ done, total, width = 24 }) {
+    const filled = total > 0 ? Math.round(Math.min(done / total, 1) * width) : 0;
+    return Text({ children: [Text({ color: 'claude', children: '█'.repeat(filled) }), Text({ color: 'subtle', children: '░'.repeat(width - filled) }), '  ', Text({ dimColor: true, children: `${done}/${total}` })] });
+}
+const cardColumns = 36;
+function card(text, isShown) {
+    return Box({
+        position: 'absolute',
+        bottom: 1,
+        left: 0,
+        width: Math.min(text.length + 2, cardColumns),
+        ...(isShown ? {} : { display: 'none', hover: { display: 'flex' } }),
+        backgroundColor: 'text',
+        paddingX: 1,
+        children: Text({ color: 'inverseText', wrap: 'wrap', children: text }),
+    });
+}

package/ui/define-pane.d.ts

@@ -1,11 +1,15 @@
-import type { Frozen, RenderElement, RenderPropsOf } from 'claude-code';
+import type { Frozen, PaneCloseInput, RenderElement, RenderPropsOf, UiScrollInput } from 'claude-code';
 import type { Mod } from '../mod.js';
 export type Pane<State extends object = Record<never, never>> = {
     readonly id: string;
     readonly title: string;
     readonly columns?: number | ((state: State) => number | undefined);
     readonly rows?: number | ((state: State) => number | undefined);
+    readonly closeOnEscape?: true;
+    readonly holdToasts?: true;
     render(mod: Mod<State>, props: Frozen<RenderPropsOf['Pane']>): RenderElement;
+    onScroll?(mod: Mod<State>, e: Frozen<UiScrollInput>): void | Promise<void>;
+    onClose?(mod: Mod<State>, e: Frozen<PaneCloseInput>): void | Promise<void>;
 };
 export declare function definePane<State extends object = Record<never, never>>(pane: Pane<State>): Pane<State>;
 //# sourceMappingURL=define-pane.d.ts.map

package/ui/define-pane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define-pane.d.ts","sourceRoot":"","sources":["../src/ui/define-pane.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI;IAC9D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,SAAS,CAAC,CAAA;IAClE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,SAAS,CAAC,CAAA;IAC/D,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,CAAA;CAC7E,CAAA;AAMD,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAOtG"}
+{"version":3,"file":"define-pane.d.ts","sourceRoot":"","sources":["../src/ui/define-pane.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACtG,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI;IAC9D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,SAAS,CAAC,CAAA;IAClE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,SAAS,CAAC,CAAA;IAC/D,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAA;IAC1B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,CAAA;IAC5E,QAAQ,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3E,CAAA;AAMD,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAOtG"}

package/utils/call-effects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-effects.d.ts","sourceRoot":"","sources":["../src/utils/call-effects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AACxE,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAErE,MAAM,MAAM,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5F,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC7E,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG;IAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAAA;AAClG,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC9F,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAClD,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAA;AAEpE,MAAM,MAAM,QAAQ,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACrE,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAA;CAAE,CAAA;AAC1F,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAA;IACrF,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,MAAM,EAAE,UAAU,EAAE,CAAA;IACpB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAC7B,CAAA;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,UAAU,CAAA;CAAE,GAAG,WAAW,CAsC/G;AAED,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,GAAG,QAAQ,CAE1E"}
+{"version":3,"file":"call-effects.d.ts","sourceRoot":"","sources":["../src/utils/call-effects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAGxD,MAAM,MAAM,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5F,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC7E,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG;IAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAAA;AAClG,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC9F,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAClD,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAA;AAEpE,MAAM,MAAM,QAAQ,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACrE,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAA;CAAE,CAAA;AAC1F,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAA;IACrF,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,MAAM,EAAE,UAAU,EAAE,CAAA;IACpB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAC7B,CAAA;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,UAAU,CAAA;CAAE,GAAG,WAAW,CAsC/G;AAED,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,GAAG,QAAQ,CAE1E"}

package/utils/call-effects.js

@@ -1,14 +1,15 @@
-import { parseShellCommands } from './parse-shell.js';
-import { expandHome, resolvePath } from './paths.js';
+import { parseShell } from './parse-shell.js';
+import { expandHome } from './paths.js';
+import { resolve } from '../vendor.js';
 export function callEffects(use, workspace) {
     const { fs } = workspace;
-    const resolve = (path, folder = workspace.cwd) => resolvePath(expandHome(path, workspace.home), folder);
-    const access = (path) => ({ path: resolve(path), contents: undefined });
+    const absolute = (path, folder = workspace.cwd) => resolve(folder, expandHome(path, workspace.home));
+    const access = (path) => ({ path: absolute(path), contents: undefined });
     const effects = { shell: undefined, reads: [], writes: [], urls: [], subagent: undefined };
     if (use.tool === 'Bash') {
         const line = textField(use, 'command');
-        const parsed = parseShellCommands(line);
-        const commands = parsed.commands.map(({ argv, folder }) => ({ argv, folder: resolve(folder) }));
+        const parsed = parseShell(line);
+        const commands = parsed.commands.map(({ argv, folder }) => ({ argv, folder: absolute(folder) }));
         effects.shell = { line, commands, isFullyParsed: parsed.isFullyParsed };
         effects.reads = parsed.reads.map(access);
         effects.writes = parsed.writes.map(access);
@@ -18,16 +19,16 @@ export function callEffects(use, workspace) {
         effects.shell = { line: textField(use, 'command'), commands: [], isFullyParsed: false };
     }
     else if (use.tool === 'Edit') {
-        const path = resolve(textField(use, 'file_path'));
+        const path = absolute(textField(use, 'file_path'));
         effects.writes = [{ path, contents: once(() => editedContents(use, path, fs)) }];
     }
     else if (use.tool === 'Write') {
-        const path = resolve(textField(use, 'file_path'));
+        const path = absolute(textField(use, 'file_path'));
         const content = textField(use, 'content');
         effects.writes = [{ path, contents: once(async () => contentsOf(content, await previousContentOf(path, fs))) }];
     }
     else if (use.tool === 'NotebookEdit') {
-        const path = resolve(textField(use, 'notebook_path'));
+        const path = absolute(textField(use, 'notebook_path'));
         effects.writes = [{ path, contents: once(async () => contentsOf(undefined, await previousContentOf(path, fs))) }];
     }
     else if (use.tool === 'Read') {
@@ -37,8 +38,8 @@ export function callEffects(use, workspace) {
         effects.reads = [access(optionalTextField(use, 'path') ?? '')];
     }
     else if (use.tool === 'Glob') {
-        const folder = resolve(optionalTextField(use, 'path') ?? '');
-        effects.reads = [{ path: resolve(textField(use, 'pattern'), folder), contents: undefined }];
+        const folder = absolute(optionalTextField(use, 'path') ?? '');
+        effects.reads = [{ path: absolute(textField(use, 'pattern'), folder), contents: undefined }];
     }
     else if (use.tool === 'WebFetch') {
         effects.urls = [textField(use, 'url')];

package/utils/parse-shell.d.ts

@@ -1,18 +1,14 @@
-export type ParsedShell = {
-    commands: [string, ...string[]][];
-    writes: string[];
-    reads: string[];
-    fetches: string[];
-    isFullyParsed: boolean;
-};
 export type ShellCommand = {
     argv: [string, ...string[]];
     folder: string;
 };
-export type ParsedShellCommands = Omit<ParsedShell, 'commands'> & {
+export type ParsedShell = {
     commands: ShellCommand[];
+    writes: string[];
+    reads: string[];
+    fetches: string[];
+    isFullyParsed: boolean;
 };
 export declare const dynamicPattern: RegExp;
 export declare function parseShell(line: string): ParsedShell;
-export declare function parseShellCommands(line: string): ParsedShellCommands;
 //# sourceMappingURL=parse-shell.d.ts.map

package/utils/parse-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shell.d.ts","sourceRoot":"","sources":["../src/utils/parse-shell.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,EAAE,CAAA;IACjC,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1E,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG;IAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,CAAA;AA2B9F,eAAO,MAAM,cAAc,QAAS,CAAA;AAiKpC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAGpD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAIpE"}
+{"version":3,"file":"parse-shell.d.ts","sourceRoot":"","sources":["../src/utils/parse-shell.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1E,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AA2BD,eAAO,MAAM,cAAc,QAAS,CAAA;AAiKpC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAIpD"}

package/utils/parse-shell.js

@@ -1,5 +1,4 @@
-import { nameOf } from './paths.js';
-import { parse } from '../vendor.js';
+import { basename, parse } from '../vendor.js';
 const markerPattern = /\u0001(\d+)\u0001/g;
 const descriptorPattern = /[0-9]+(?=[<>])/y;
 const assignmentPattern = /^[A-Za-z_][A-Za-z0-9_]*(\[[^\]]*\])?\+?=/;
@@ -163,10 +162,6 @@ const inlineCodeFlags = new Map([
     ['osascript', ['-e']],
 ]);
 export function parseShell(line) {
-    const parsed = parseShellCommands(line);
-    return { ...parsed, commands: parsed.commands.map((command) => command.argv) };
-}
-export function parseShellCommands(line) {
     const result = { commands: [], writes: [], reads: [], fetches: [], isFullyParsed: true };
     parseLine(line, '', result);
     return result;
@@ -533,7 +528,7 @@ function wordOf(token, markers, folder, result) {
     return {
         text: raw.replace(markerPattern, (_, index) => markers[Number(index)].raw),
         isGlob: typeof token !== 'string',
-        isDynamic: /[$\u0001]/.test(nameOf(raw)),
+        isDynamic: /[$\u0001]/.test(basename(raw)),
     };
 }
 function finish(command, operator, folder, result) {
@@ -573,7 +568,7 @@ function addRedirect({ operator, target }, folder, result) {
 function addCommand(first, args, folder, stdin, result) {
     if (first.isDynamic || first.isGlob)
         result.isFullyParsed = false;
-    const program = nameOf(first.text);
+    const program = basename(first.text);
     if (program === 'git')
         addGit(first, args, folder, result);
     else if (program === 'find')
@@ -734,7 +729,7 @@ function addCopy(program, args, folder, result) {
     const target = options.findLast((option) => program.targetOptions?.includes(option.name) === true)?.value;
     const only = operands[0];
     if (program.linksHere === true && target === undefined && operands.length === 1 && only !== undefined) {
-        addPath(result, 'writes', { ...only, text: nameOf(only.text) }, folder);
+        addPath(result, 'writes', { ...only, text: basename(only.text) }, folder);
         return;
     }
     const destination = target ?? operands.at(-1);
@@ -746,7 +741,7 @@ function addCopy(program, args, folder, result) {
         if (program.sources !== undefined)
             addPath(result, program.sources, source, folder);
         if (isLocal(destination) && !source.isGlob && !destination.isGlob)
-            addPathText(result, 'writes', `${destination.text.replace(/\/+$/, '')}/${nameOf(source.text)}`, folder);
+            addPathText(result, 'writes', `${destination.text.replace(/\/+$/, '')}/${basename(source.text)}`, folder);
     }
     if (isLocal(destination))
         addPath(result, 'writes', destination, folder);

package/utils/paths.d.ts

@@ -7,9 +7,6 @@ export type FileSystem = {
     exists: (path: string) => Promise<boolean>;
 };
 export declare function expandHome(path: string, home: string): string;
-export declare function resolvePath(path: string, folder: string): string;
-export declare function parentOf(path: string): string;
-export declare function nameOf(path: string): string;
 export declare function relativePath(base: string, path: string): string | undefined;
 export declare function realPathOf(path: string, fs: FileSystem): Promise<string | undefined>;
 //# sourceMappingURL=paths.d.ts.map

package/utils/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/utils/paths.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtF,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3C,CAAA;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAOhE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI3E;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK1F"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/utils/paths.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACtF,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3C,CAAA;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI3E;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK1F"}

package/utils/paths.js

@@ -1,23 +1,8 @@
+import { basename, dirname, resolve } from '../vendor.js';
 export function expandHome(path, home) {
     const prefix = /^(~|\$HOME)(?=\/|$)/.exec(path)?.[0];
     return prefix === undefined ? path : `${home}${path.slice(prefix.length)}`;
 }
-export function resolvePath(path, folder) {
-    const parts = [];
-    for (const part of (path.startsWith('/') ? path : `${folder}/${path}`).split('/')) {
-        if (part === '..')
-            parts.pop();
-        else if (part !== '' && part !== '.')
-            parts.push(part);
-    }
-    return `/${parts.join('/')}`;
-}
-export function parentOf(path) {
-    return resolvePath('..', path);
-}
-export function nameOf(path) {
-    return path.slice(path.lastIndexOf('/') + 1);
-}
 export function relativePath(base, path) {
     if (path === base)
         return '';
@@ -28,6 +13,6 @@ export async function realPathOf(path, fs) {
     const stat = await fs.stat(path).catch(() => undefined);
     if (stat !== undefined || path === '/')
         return stat?.realPath;
-    const folder = await realPathOf(parentOf(path), fs);
-    return folder === undefined ? undefined : resolvePath(nameOf(path), folder);
+    const folder = await realPathOf(dirname(path), fs);
+    return folder === undefined ? undefined : resolve(folder, basename(path));
 }

package/vendor.d.ts

@@ -1,4 +1,5 @@
 export { Validator } from '@cfworker/json-schema';
+export { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve } from 'pathe';
 export { default as picomatch } from 'picomatch/posix';
 export { parse, quote, type GlobPattern, type ParseEntry } from 'shell-quote';
 //# sourceMappingURL=vendor.d.ts.map

package/vendor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vendor.d.ts","sourceRoot":"","sources":["src/vendor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"vendor.d.ts","sourceRoot":"","sources":["src/vendor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAClG,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA"}