@poping/yome 0.0.2 → 0.0.4

package/dist/tools/askUser.js

@@ -0,0 +1,126 @@
+// cli/src/tools/askUser.ts
+//
+// `AskUser` — agent tool that pauses execution and surfaces 1–4
+// multiple-choice questions in the TUI. The agent uses it to clarify
+// ambiguous requirements or to let the user pick between approaches
+// BEFORE doing irreversible work.
+//
+// Routing:
+//   - In TUI mode: tools/index.ts has registered an ask-user handler
+//     (App.tsx mounts it on startup); this tool awaits the user's
+//     answers and returns them as JSON.
+//   - In headless / SDK mode: no handler is registered — the tool
+//     short-circuits with a "no UI available" answer so the agent can
+//     keep going (or pick a default itself).
+let _askUserFn = null;
+export function setAskUserHandler(fn) {
+    _askUserFn = fn;
+}
+// ── Tool ─────────────────────────────────────────────────────────────
+const DESCRIPTION = 'Ask the user 1–4 multiple-choice questions during execution to clarify ambiguous ' +
+    'requirements or let them pick between trade-offs. ' +
+    'Each question has 2–4 options; do NOT include an "Other" option, the UI provides ' +
+    'a custom-answer entry automatically. ' +
+    'BLOCKING: this tool waits for the user to answer in the TUI before returning.';
+export const askUserTool = {
+    name: 'AskUser',
+    description: DESCRIPTION,
+    inputSchema: {
+        type: 'object',
+        properties: {
+            questions: {
+                type: 'array',
+                description: '1–4 questions to ask the user (asked one at a time, in order).',
+                items: {
+                    type: 'object',
+                    properties: {
+                        question: {
+                            type: 'string',
+                            description: 'Full question text. Should end with `?` and be self-contained.',
+                        },
+                        header: {
+                            type: 'string',
+                            description: 'Short chip label (≤ 12 chars), e.g. "Library", "Approach".',
+                        },
+                        options: {
+                            type: 'array',
+                            description: '2–4 mutually exclusive choices. Do NOT add an "Other" option.',
+                            items: {
+                                type: 'object',
+                                properties: {
+                                    label: { type: 'string', description: 'Concise option label (1–5 words).' },
+                                    description: { type: 'string', description: 'Optional one-line explanation.' },
+                                },
+                                required: ['label'],
+                            },
+                        },
+                    },
+                    required: ['question', 'header', 'options'],
+                },
+            },
+        },
+        required: ['questions'],
+    },
+    isReadOnly() { return true; },
+    validateInput(input) {
+        if (!Array.isArray(input.questions) || input.questions.length === 0) {
+            return { valid: false, error: 'questions must be a non-empty array' };
+        }
+        if (input.questions.length > 4) {
+            return { valid: false, error: `at most 4 questions per call (got ${input.questions.length})` };
+        }
+        const seenQuestions = new Set();
+        for (let i = 0; i < input.questions.length; i++) {
+            const q = input.questions[i];
+            if (!q || typeof q !== 'object') {
+                return { valid: false, error: `questions[${i}] must be an object` };
+            }
+            if (typeof q.question !== 'string' || !q.question.trim()) {
+                return { valid: false, error: `questions[${i}].question must be a non-empty string` };
+            }
+            if (seenQuestions.has(q.question)) {
+                return { valid: false, error: `duplicate question text at questions[${i}]` };
+            }
+            seenQuestions.add(q.question);
+            if (typeof q.header !== 'string' || !q.header.trim()) {
+                return { valid: false, error: `questions[${i}].header must be a non-empty string` };
+            }
+            if (q.header.length > 12) {
+                return { valid: false, error: `questions[${i}].header must be ≤ 12 chars (got ${q.header.length})` };
+            }
+            if (!Array.isArray(q.options) || q.options.length < 2 || q.options.length > 4) {
+                return { valid: false, error: `questions[${i}].options must have 2–4 items` };
+            }
+            const seenLabels = new Set();
+            for (let j = 0; j < q.options.length; j++) {
+                const opt = q.options[j];
+                if (!opt || typeof opt !== 'object') {
+                    return { valid: false, error: `questions[${i}].options[${j}] must be an object` };
+                }
+                if (typeof opt.label !== 'string' || !opt.label.trim()) {
+                    return { valid: false, error: `questions[${i}].options[${j}].label must be a non-empty string` };
+                }
+                if (seenLabels.has(opt.label)) {
+                    return { valid: false, error: `duplicate option label "${opt.label}" in questions[${i}]` };
+                }
+                seenLabels.add(opt.label);
+            }
+        }
+        return { valid: true };
+    },
+    async execute(input) {
+        const questions = input.questions;
+        if (!_askUserFn) {
+            // Headless / SDK / non-TUI host. Tell the agent there's no
+            // interactive UI so it can fall back to a default.
+            return JSON.stringify({
+                answers: {},
+                cancelled: true,
+                reason: 'No interactive UI is attached to this session. AskUser is unavailable here — pick a sensible default and proceed, or surface the question in your reply.',
+            }, null, 2);
+        }
+        const result = await _askUserFn(questions);
+        return JSON.stringify(result, null, 2);
+    },
+};
+//# sourceMappingURL=askUser.js.map

package/dist/tools/askUser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"askUser.js","sourceRoot":"","sources":["../../src/tools/askUser.ts"],"names":[],"mappings":"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"}

package/dist/tools/bash.js

@@ -1,7 +1,23 @@
 import { spawn } from 'child_process';
 import { isContentAllowed, isContentDenied } from '../permissions/checker.js';
 const MAX_OUTPUT = 20_000;
-function runCommand(command, timeout) {
+// Cap per-stream buffer to 4× the output limit. Without this, a runaway
+// command (`cat /dev/urandom`, broken `npm run build`) accumulates an
+// unbounded JS string in memory before we ever get to truncate it.
+// This is the difference between "tool reports truncated" and "node
+// process gets OOM-killed mid-session".
+const MAX_BUFFER = MAX_OUTPUT * 4;
+// ── Pure system shell ─────────────────────────────────────────────
+//
+// Bash used to call `tryKernel()` first to opportunistically intercept
+// hub-skill invocations like `xl books`. That made routing implicit and
+// hard to debug — it was never obvious whether a given Bash call had
+// actually hit /bin/sh or had been redirected into AppleScript.
+//
+// The kernel intercept now lives behind a separate `Yome` tool
+// (cli/src/tools/yome.ts). Bash is once again *only* a system shell;
+// the agent picks the right tool up-front based on intent.
+function runShell(command, timeout) {
     return new Promise((resolve) => {
         const proc = spawn('sh', ['-c', command], {
             cwd: process.cwd(),
@@ -10,15 +26,41 @@ function runCommand(command, timeout) {
         });
         let stdout = '';
         let stderr = '';
+        let stdoutOverflow = false;
+        let stderrOverflow = false;
         let killed = false;
         const timer = setTimeout(() => {
             killed = true;
             proc.kill('SIGTERM');
         }, timeout);
-        proc.stdout.on('data', (data) => { stdout += data.toString(); });
-        proc.stderr.on('data', (data) => { stderr += data.toString(); });
+        // Stream-side cap: once a buffer hits MAX_BUFFER chars we stop
+        // accumulating from that pipe. The child can keep running (we don't
+        // want to break commands that legitimately produce a lot of output —
+        // tests, builds, etc.) but the agent's memory stays bounded.
+        proc.stdout.on('data', (data) => {
+            if (stdoutOverflow)
+                return;
+            stdout += data.toString();
+            if (stdout.length > MAX_BUFFER) {
+                stdout = stdout.slice(0, MAX_BUFFER);
+                stdoutOverflow = true;
+            }
+        });
+        proc.stderr.on('data', (data) => {
+            if (stderrOverflow)
+                return;
+            stderr += data.toString();
+            if (stderr.length > MAX_BUFFER) {
+                stderr = stderr.slice(0, MAX_BUFFER);
+                stderrOverflow = true;
+            }
+        });
         proc.on('close', (code) => {
             clearTimeout(timer);
+            if (stdoutOverflow)
+                stdout += `\n[stdout capped at ${MAX_BUFFER} chars]`;
+            if (stderrOverflow)
+                stderr += `\n[stderr capped at ${MAX_BUFFER} chars]`;
             if (killed) {
                 resolve({ stdout, stderr: `Command timed out after ${timeout / 1000}s`, exitCode: 124 });
             }
@@ -32,9 +74,24 @@ function runCommand(command, timeout) {
         });
     });
 }
+function formatOutput(stdout, stderr, exitCode) {
+    if (exitCode === 0) {
+        const result = stdout.trim();
+        if (result.length > MAX_OUTPUT) {
+            return result.slice(0, MAX_OUTPUT) + `\n\n[Output truncated at ${MAX_OUTPUT} chars]`;
+        }
+        return result || '(no output)';
+    }
+    const output = [stdout.trim(), stderr.trim()].filter(Boolean).join('\n');
+    return `Exit code: ${exitCode}\n${output}`;
+}
 export const bashTool = {
     name: 'Bash',
-    description: 'Execute a shell command and return its output. Commands run in the current working directory.',
+    description: 'Execute a system shell command via /bin/sh and return its output. ' +
+        'Use this for real shell operations: ls, cat, mkdir, git, curl, build/test runners, pipes, redirects, etc. ' +
+        'Commands run in the current working directory. ' +
+        'This tool does NOT route to yome hub skills — to invoke an installed skill (xl, ppt, cal, fs, rem, …) ' +
+        'use the dedicated `Yome` tool instead.',
     inputSchema: {
         type: 'object',
         properties: {
@@ -63,16 +120,8 @@ export const bashTool = {
     async execute(input) {
         const command = input.command;
         const timeout = (input.timeout || 30) * 1000;
-        const { stdout, stderr, exitCode } = await runCommand(command, timeout);
-        if (exitCode === 0) {
-            const result = stdout.trim();
-            if (result.length > MAX_OUTPUT) {
-                return result.slice(0, MAX_OUTPUT) + `\n\n[Output truncated at ${MAX_OUTPUT} chars]`;
-            }
-            return result || '(no output)';
-        }
-        const output = [stdout.trim(), stderr.trim()].filter(Boolean).join('\n');
-        return `Exit code: ${exitCode}\n${output}`;
+        const { stdout, stderr, exitCode } = await runShell(command, timeout);
+        return formatOutput(stdout, stderr, exitCode);
     },
 };
 //# sourceMappingURL=bash.js.map

package/dist/tools/bash.js.map

@@ -1 +1 @@
-{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"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"}

package/dist/tools/index.d.ts

@@ -1,15 +1,37 @@
 import type { ToolDef, AnthropicTool } from '../types.js';
 import type { ToolPermissionContext } from '../permissions/types.js';
 export declare const BASE_TOOLS: ToolDef[];
+export { setAskUserHandler } from './askUser.js';
+export type { AskUserQuestion, AskUserResult } from './askUser.js';
 export declare function registerTool(tool: ToolDef): void;
 export declare function getToolByName(name: string): ToolDef | undefined;
 export declare function getAllTools(): ToolDef[];
 export declare function getAnthropicTools(): AnthropicTool[];
+/**
+ * Result returned by the UI after the user resolves an approval prompt.
+ * - allow:    proceed with this single invocation
+ * - deny:     refuse this invocation; optional `feedback` is forwarded to the model
+ *             and `abort` cancels the rest of the current tool_use batch
+ */
+export type AskPermissionResult = {
+    decision: 'allow';
+} | {
+    decision: 'deny';
+    feedback?: string;
+    abort?: boolean;
+};
 export declare function setPermissionContext(ctx: ToolPermissionContext): void;
 export declare function getPermissionContext(): ToolPermissionContext | null;
 /**
  * Register a callback that will be called when a tool requires user approval.
- * Return true to allow, false to deny.
+ * Return an AskPermissionResult describing the user's choice.
+ */
+export declare function setAskPermissionHandler(fn: (toolName: string, message: string, input: Record<string, unknown>) => Promise<AskPermissionResult>): void;
+/**
+ * Sentinel substring embedded in tool_result content when the user explicitly
+ * rejects a tool_use. Loops detect this prefix to short-circuit the remaining
+ * tool_use blocks in the same model turn (mirrors claude-code's REJECT_MESSAGE
+ * + cancelAndAbort behavior).
  */
-export declare function setAskPermissionHandler(fn: (toolName: string, message: string, input: Record<string, unknown>) => Promise<boolean>): void;
+export declare const REJECT_SENTINEL = "[YOME_PERMISSION_DENIED]";
 export declare function executeTool(name: string, input: Record<string, unknown>, signal?: AbortSignal): Promise<string>;

package/dist/tools/index.js

@@ -3,19 +3,37 @@ import { readTool } from './read.js';
 import { editTool } from './edit.js';
 import { writeTool } from './write.js';
 import { bashTool } from './bash.js';
+import { yomeTool } from './yome.js';
 import { globTool } from './glob.js';
 import { grepTool } from './grep.js';
 import { lsTool } from './ls.js';
+import { askUserTool } from './askUser.js';
+import { todoWriteTool } from './todoWrite.js';
 const DEFAULT_MAX_RESULT_CHARS = 20_000;
+// Hub skill invocations are handled by the dedicated `Yome` tool, which
+// runs the kernel in cli/src/skills/runner/kernel.ts. `Bash` is now a
+// pure /bin/sh wrapper with no implicit skill routing — the agent picks
+// the right tool based on intent (skill call vs shell op).
+//
+// `AskUser` and `TodoWrite` are interactive / state-management tools.
+// AskUser pauses the agent loop until the TUI returns the user's
+// answers (and degrades to "no UI" in headless mode); TodoWrite mutates
+// session-scope todo state that the UI subscribes to.
 export const BASE_TOOLS = [
     readTool,
     editTool,
     writeTool,
     bashTool,
+    yomeTool,
+    askUserTool,
+    todoWriteTool,
     globTool,
     grepTool,
     lsTool,
 ];
+// Re-export the AskUser handler hook so App.tsx can register the TUI
+// implementation without reaching into the tools/ subtree directly.
+export { setAskUserHandler } from './askUser.js';
 const toolMap = new Map();
 for (const t of BASE_TOOLS)
     toolMap.set(t.name, t);
@@ -47,11 +65,33 @@ export function getPermissionContext() {
 }
 /**
  * Register a callback that will be called when a tool requires user approval.
- * Return true to allow, false to deny.
+ * Return an AskPermissionResult describing the user's choice.
  */
 export function setAskPermissionHandler(fn) {
     _askPermissionFn = fn;
 }
+/**
+ * Sentinel substring embedded in tool_result content when the user explicitly
+ * rejects a tool_use. Loops detect this prefix to short-circuit the remaining
+ * tool_use blocks in the same model turn (mirrors claude-code's REJECT_MESSAGE
+ * + cancelAndAbort behavior).
+ */
+export const REJECT_SENTINEL = '[YOME_PERMISSION_DENIED]';
+const DENIAL_GUIDANCE = 'IMPORTANT: You may attempt the user\'s underlying goal with a different tool or approach, ' +
+    'but do not try to bypass the intent of this denial. If you cannot proceed without this ' +
+    'capability, stop and explain to the user what you were trying to do and why.';
+function buildRejectMessage(toolName, feedback) {
+    const base = `${REJECT_SENTINEL} The user rejected the ${toolName} tool use. ` +
+        `The action was NOT performed (no files changed, no commands executed). ` +
+        `Stop the current plan and wait for the user's next instruction unless they provided guidance below.`;
+    const tail = feedback && feedback.trim()
+        ? `\nUser feedback: ${feedback.trim()}`
+        : '';
+    return `${base}${tail}\n${DENIAL_GUIDANCE}`;
+}
+function buildAutoDenyMessage(toolName, reason) {
+    return `${REJECT_SENTINEL} Permission to use ${toolName} was denied by a configured rule: ${reason}. ${DENIAL_GUIDANCE}`;
+}
 export async function executeTool(name, input, signal) {
     const tool = toolMap.get(name);
     if (!tool)
@@ -68,13 +108,22 @@ export async function executeTool(name, input, signal) {
         const toolResult = tool.checkPermissions?.(input, _permCtx);
         const decision = checkPermission(tool.name, tool.isReadOnly(), _permCtx, toolResult ?? undefined);
         if (decision.behavior === 'deny') {
-            return `Permission denied: ${decision.message}`;
+            return buildAutoDenyMessage(tool.name, decision.message);
         }
         if (decision.behavior === 'ask') {
             if (_askPermissionFn) {
-                const allowed = await _askPermissionFn(tool.name, decision.message, input);
-                if (!allowed) {
-                    return `Permission denied by user for ${tool.name}.`;
+                const result = await _askPermissionFn(tool.name, decision.message, input);
+                if (result.decision === 'deny') {
+                    if (result.abort) {
+                        // Hard abort — caller listens on its own AbortSignal but we still
+                        // return a synthetic tool_result so the model gets a chance to see
+                        // why we stopped before the loop short-circuits.
+                        try {
+                            signal?.controller?.abort?.();
+                        }
+                        catch { /* noop */ }
+                    }
+                    return buildRejectMessage(tool.name, result.feedback);
                 }
             }
             // If no handler is registered, fall through and allow (default permissive)

package/dist/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}

package/dist/tools/skillCall.d.ts

@@ -0,0 +1,2 @@
+import type { ToolDef } from '../types.js';
+export declare const skillCallTool: ToolDef;

package/dist/tools/skillCall.js

@@ -0,0 +1,77 @@
+// cli/src/tools/skillCall.ts
+//
+// `SkillCall` — agent tool that invokes an action on an installed yome
+// hub skill. This is the only correct way for the LLM to use hub skills;
+// it must NOT try to map them to ad-hoc shell commands like
+// `yome ppt new` (the model used to do that — `Bash(yome ppt new)`
+// always fails since there's no such CLI subcommand).
+//
+// Input shape (kept minimal so the system prompt can teach it cheaply):
+//
+//   {
+//     "slug":        "@yome/ppt",
+//     "action":      "new",
+//     "positionals": ["/Users/me/Desktop/hello.pptx"],
+//     "flags":       { "force": true }
+//   }
+//
+// Output is the dispatcher's stdout (or stderr prefixed with "ERROR:").
+import { invokeSkill } from '../yomeSkills/invoke.js';
+export const skillCallTool = {
+    name: 'SkillCall',
+    description: 'Invoke an action on an installed yome hub skill. ' +
+        'Use this whenever the user asks to do something that an installed skill (`yome skill list`) supports — ' +
+        'for example creating/editing a PowerPoint with @yome/ppt. ' +
+        'Do NOT shell out to commands like "yome ppt new" — those do not exist; only this tool dispatches skills.',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            slug: {
+                type: 'string',
+                description: 'Skill slug like "@yome/ppt", or just the domain like "ppt".',
+            },
+            action: {
+                type: 'string',
+                description: 'Action name from the skill\'s command list (e.g. "new", "open", "slide.add", "title", "save", "export").',
+            },
+            positionals: {
+                type: 'array',
+                items: { type: 'string' },
+                description: 'Positional arguments. For ppt.new this is the .pptx path.',
+            },
+            flags: {
+                type: 'object',
+                description: 'Named flags. Values are strings, numbers, or booleans.',
+            },
+        },
+        required: ['slug', 'action'],
+    },
+    isReadOnly: () => false,
+    validateInput(input) {
+        if (typeof input.slug !== 'string' || input.slug.length === 0) {
+            return { valid: false, error: 'slug must be a non-empty string' };
+        }
+        if (typeof input.action !== 'string' || input.action.length === 0) {
+            return { valid: false, error: 'action must be a non-empty string' };
+        }
+        if (input.positionals !== undefined && !Array.isArray(input.positionals)) {
+            return { valid: false, error: 'positionals must be an array of strings' };
+        }
+        if (input.flags !== undefined && (typeof input.flags !== 'object' || Array.isArray(input.flags))) {
+            return { valid: false, error: 'flags must be an object' };
+        }
+        return { valid: true };
+    },
+    async execute(input) {
+        const slug = String(input.slug);
+        const action = String(input.action);
+        const positionals = input.positionals ?? [];
+        const flags = input.flags ?? {};
+        const r = await invokeSkill({ slugOrDomain: slug, action, positionals, flags });
+        if (!r.ok) {
+            return `ERROR (exit ${r.exitCode}): ${r.stderr || '(no stderr)'}`;
+        }
+        return r.stdout || '(no output)';
+    },
+};
+//# sourceMappingURL=skillCall.js.map

package/dist/tools/skillCall.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skillCall.js","sourceRoot":"","sources":["../../src/tools/skillCall.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,EAAE;AACF,uEAAuE;AACvE,yEAAyE;AACzE,4DAA4D;AAC5D,mEAAmE;AACnE,sDAAsD;AACtD,EAAE;AACF,wEAAwE;AACxE,EAAE;AACF,MAAM;AACN,kCAAkC;AAClC,4BAA4B;AAC5B,uDAAuD;AACvD,uCAAuC;AACvC,MAAM;AACN,EAAE;AACF,wEAAwE;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,CAAC,MAAM,aAAa,GAAY;IACpC,IAAI,EAAE,WAAW;IACjB,WAAW,EACT,mDAAmD;QACnD,yGAAyG;QACzG,4DAA4D;QAC5D,0GAA0G;IAC5G,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,6DAA6D;aAC3E;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,WAAW,EACT,0GAA0G;aAC7G;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACzB,WAAW,EAAE,2DAA2D;aACzE;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,wDAAwD;aACtE;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;KAC7B;IAED,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;IAEvB,aAAa,CAAC,KAAK;QACjB,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC;QACpE,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,mCAAmC,EAAE,CAAC;QACtE,CAAC;QACD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YACzE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,yCAAyC,EAAE,CAAC;QAC5E,CAAC;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACjG,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC;QAC5D,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAK;QACjB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,WAAW,GAAI,KAAK,CAAC,WAAoC,IAAI,EAAE,CAAC;QACtE,MAAM,KAAK,GAAI,KAAK,CAAC,KAA2E,IAAI,EAAE,CAAC;QAEvG,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACV,OAAO,eAAe,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;QACpE,CAAC;QACD,OAAO,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC;IACnC,CAAC;CACF,CAAC"}

package/dist/tools/todoWrite.d.ts

@@ -0,0 +1,2 @@
+import type { ToolDef } from '../types.js';
+export declare const todoWriteTool: ToolDef;