ctxr-cli 0.33.0 → 0.35.0

package/dist/core/mcp/tools/cli.js

@@ -0,0 +1,271 @@
+import { createHash, randomBytes } from 'node:crypto';
+import { lstat, mkdir, readFile, rm, unlink, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { rebaseInProgress } from '../../session/resolve.js';
+import { runServerCli } from '../cli-runner.js';
+import { ToolRefusal } from '../jsonrpc.js';
+import { ownedSession, repoPrefixOf } from '../member-sessions.js';
+import { protectedReason, protectedRefusal } from '../paths.js';
+import { CTXR_READ_COMMANDS, CTXR_WRITE_COMMANDS, INPUT_ARGUMENT, matchCommand } from '../tool-map.js';
+/**
+ * serve-the-session-lifecycle-to-chat-apps D4, D5 (remote-access spec,
+ * *`ctxr` and `ctxr_write` run allowlisted CLI commands confined to one
+ * checkout*): a skill's "run `ctxr lint`" works unchanged. `ctxr` runs a
+ * read-only command against the served commit or one of the caller's
+ * sessions; `ctxr_write` runs a writing one inside a session the caller owns.
+ * Each runs the server's own CLI with the checkout as its working directory
+ * and store root, without the server's forge credentials. Before anything
+ * runs, the subcommand must be on the tool's allowlist, the root option is
+ * refused, and every path-like argument must stay inside the checkout and off
+ * the protected paths. After a `ctxr_write` run, every protected path git
+ * shows it changed is restored and the call refused, whatever destination the
+ * command derived — the boundary does not rest on each command's own checks.
+ */
+export const CTXR_INPUT_SCHEMA = {
+    type: 'object',
+    properties: {
+        args: { type: 'array', items: { type: 'string' }, description: `The command and its arguments, as you would type them after "ctxr", one item per argument, e.g. ["lint"] or ["catalog", "show", "--section", "projects"]. Read-only commands only: ${CTXR_READ_COMMANDS.join(', ')}.` },
+        session: { type: 'string', description: "Run in this session of yours (its directory name) instead of against the store's current commit." },
+    },
+    required: ['args'],
+};
+export const CTXR_WRITE_INPUT_SCHEMA = {
+    type: 'object',
+    properties: {
+        args: { type: 'array', items: { type: 'string' }, description: `The command and its arguments, one item per argument, e.g. ["ingest", "<root>raw/inbox/x.md", "--into", "<root>projects/kestrel.md", ...]. Writing commands only: ${CTXR_WRITE_COMMANDS.join(', ')}.` },
+        session: { type: 'string', description: 'The session of yours to run in (its directory name). Required.' },
+        input: { type: 'string', description: `Text for a command that reads a file (rollup write --content-file, session capture --proposal): pass "${INPUT_ARGUMENT}" as that argument and it is replaced with a file holding this text.` },
+    },
+    required: ['args', 'session'],
+};
+const MAX_ARGS = 64;
+const MAX_ARG_CHARS = 8192;
+/** D4: the `input` text is capped like `Write`'s content. */
+const MAX_INPUT_BYTES = 256 * 1024;
+const invalid = (message) => new ToolRefusal('mcp.invalid_arguments', message);
+export function parseCliArgs(args, write) {
+    const argv = args.args;
+    if (!Array.isArray(argv) || argv.length === 0 || argv.some((a) => typeof a !== 'string'))
+        throw invalid('"args" is a non-empty list of strings: the command, then its arguments.');
+    if (argv.length > MAX_ARGS || argv.some((a) => a.length > MAX_ARG_CHARS || a.includes('\0')))
+        throw invalid(`"args" holds at most ${MAX_ARGS} arguments of at most ${MAX_ARG_CHARS} characters each.`);
+    const out = { args: [...argv] };
+    if (args.session !== undefined && args.session !== null) {
+        if (typeof args.session !== 'string' || args.session.trim() === '')
+            throw invalid('"session", when given, is the directory name of one of your sessions.');
+        out.session = args.session.trim();
+    }
+    else if (write) {
+        throw new ToolRefusal('mcp.no_session', '"session" is required: ctxr_write runs only inside one of your sessions. Call session_start first.');
+    }
+    if (args.input !== undefined && args.input !== null) {
+        if (!write)
+            throw invalid('"input" is for ctxr_write only.');
+        if (typeof args.input !== 'string')
+            throw invalid('"input" must be a string.');
+        if (Buffer.byteLength(args.input, 'utf8') > MAX_INPUT_BYTES)
+            throw invalid(`"input" is at most ${MAX_INPUT_BYTES} bytes.`);
+        out.input = args.input;
+    }
+    return out;
+}
+/** The root option, in either spelling, wherever it appears. */
+function isRootOption(token) {
+    return token === '--root' || token.startsWith('--root=');
+}
+/** What a token says, if it could be a path: an option's `=` value, a bare argument; never an option name or prose. */
+function pathCandidate(token) {
+    if (token.startsWith('-')) {
+        const eq = token.indexOf('=');
+        if (!token.startsWith('--') || eq === -1)
+            return null;
+        return { value: token.slice(eq + 1), prefix: token.slice(0, eq + 1) };
+    }
+    return { value: token, prefix: '' };
+}
+/**
+ * D4: every argument after the command path, checked before anything runs.
+ * A path under the caller's session root is rewritten to the path inside the
+ * session, which is what the command sees as its store root; any other
+ * path-like argument must stay inside the checkout and off the protected paths.
+ */
+export function checkArguments(argv, allowlist, tool, config, sessionRoot) {
+    if (argv.some(isRootOption))
+        throw new ToolRefusal('mcp.root_option', 'The root option is not accepted: the command always runs against the checkout this tool chose.');
+    const command = matchCommand(argv, allowlist);
+    if (command === null) {
+        throw new ToolRefusal('mcp.command_not_allowed', `"${argv.join(' ')}" is not a command ${tool} runs. Put the command first; ${tool} runs: ${allowlist.join(', ')}.`, { allowed: [...allowlist] });
+    }
+    const words = command.split(' ').length;
+    const rewritten = argv.slice(0, words);
+    for (const token of argv.slice(words)) {
+        const candidate = pathCandidate(token);
+        if (candidate === null || candidate.value === INPUT_ARGUMENT || /\s/.test(candidate.value) || candidate.value === '') {
+            rewritten.push(token);
+            continue;
+        }
+        let value = candidate.value.replace(/\\/g, '/');
+        if (sessionRoot !== null) {
+            const root = sessionRoot.replace(/\/+$/, '');
+            const bare = value.replace(/^\/+/, '');
+            if (bare === root)
+                value = '.';
+            else if (bare.startsWith(`${root}/`))
+                value = bare.slice(root.length + 1);
+        }
+        if (path.posix.isAbsolute(value) || /^[A-Za-z]:\//.test(value)) {
+            throw new ToolRefusal('mcp.path_outside_store', `"${candidate.value}" is an absolute path; name files relative to the store${sessionRoot === null ? '' : ` or under your session root ${sessionRoot}`}.`);
+        }
+        const normalized = path.posix.normalize(value);
+        if (normalized === '..' || normalized.startsWith('../'))
+            throw new ToolRefusal('mcp.path_outside_store', `"${candidate.value}" is outside the checkout this command runs in.`);
+        const reason = protectedReason(normalized.replace(/\/+$/, ''), config);
+        if (reason !== null && normalized !== '.')
+            throw protectedRefusal(candidate.value, reason);
+        rewritten.push(`${candidate.prefix}${value}`);
+    }
+    return { command, argv: rewritten };
+}
+/** D4: the server's environment without its forge credentials, with the checkout as the store root. */
+export function childEnv(env, cwd, cacheDir) {
+    const child = {};
+    for (const [key, value] of Object.entries(env)) {
+        if (value === undefined)
+            continue;
+        if (/TOKEN/i.test(key) || key.startsWith('GH_') || key.startsWith('GITHUB_') || key.startsWith('CONTEXTURE_GITHUB_'))
+            continue;
+        if (key === 'CONTEXTURE_ROOT' || key === 'CONTEXTURE_STORE_ROOT' || key === 'GIT_ASKPASS' || key === 'SSH_ASKPASS' || key === 'SSH_AUTH_SOCK')
+            continue;
+        child[key] = value;
+    }
+    child.CONTEXTURE_STORE_ROOT = cwd;
+    // gh's own credential file is out of reach too: its configuration directory is one that does not exist.
+    child.GH_CONFIG_DIR = path.join(cacheDir, 'no-gh-config');
+    child.GIT_TERMINAL_PROMPT = '0';
+    return child;
+}
+/** `--no-input` always: nothing a tool runs may wait on a person. */
+function finalArgv(argv) {
+    return argv.includes('--no-input') ? [...argv] : [...argv, '--no-input'];
+}
+export async function ctxrTool(ctx, email, args) {
+    if (args.session !== undefined) {
+        const session = await ownedSession(ctx.write, email, args.session);
+        const checked = checkArguments(args.args, CTXR_READ_COMMANDS, 'ctxr', ctx.write.config, session.root);
+        const cwd = session.ref.storeRoot;
+        const run = await runServerCli({ entry: ctx.entry, argv: finalArgv(checked.argv), cwd, env: childEnv(ctx.write.env, cwd, cacheDirOf(ctx.write, cwd)), timeoutMs: ctx.timeoutMs });
+        return { command: checked.command, args: checked.argv, ...run, ran_against: { session: session.name, root: session.root } };
+    }
+    return ctx.view.read(ctx.syncDeps, async (snapshot) => {
+        const checked = checkArguments(args.args, CTXR_READ_COMMANDS, 'ctxr', snapshot.store.config, null);
+        const cwd = snapshot.store.root;
+        const run = await runServerCli({ entry: ctx.entry, argv: finalArgv(checked.argv), cwd, env: childEnv(ctx.write.env, cwd, cacheDirOf(ctx.write, cwd)), timeoutMs: ctx.timeoutMs });
+        return { command: checked.command, args: checked.argv, ...run, ran_against: { commit: snapshot.head } };
+    });
+}
+function cacheDirOf(write, storeRoot) {
+    return path.join(storeRoot, write.config.derived.paths[0] ?? '.contexture/cache/', 'mcp');
+}
+/** A path's state for the after-run check: its content's hash, or absent. */
+async function stateOf(file) {
+    const info = await lstat(file).catch(() => null);
+    if (info === null)
+        return 'absent';
+    if (info.isSymbolicLink())
+        return 'link';
+    if (!info.isFile())
+        return 'other';
+    return createHash('sha256').update(await readFile(file)).digest('hex');
+}
+/**
+ * The protected paths git shows changed in the session, other than derived
+ * ones, with each one's state. Rename sources count: moving a hook away
+ * changes the hooks directory as surely as writing one.
+ */
+async function protectedChanges(write, session) {
+    const prefix = await repoPrefixOf(write);
+    const { stdout } = await write.git.run(['status', '--porcelain=v1', '-z', '--untracked-files=all', '--no-renames'], { cwd: session.ref.path, allowFailure: true });
+    const found = new Map();
+    for (const field of stdout.split('\0')) {
+        if (field.length < 4)
+            continue;
+        const top = field.slice(3);
+        let reason;
+        if (!top.startsWith(prefix))
+            reason = 'outside';
+        else
+            reason = protectedReason(top.slice(prefix.length).replace(/\/+$/, ''), write.config);
+        if (reason === null || reason === 'derived')
+            continue;
+        found.set(top, { top, reason, state: await stateOf(path.join(session.ref.path, top)) });
+    }
+    return found;
+}
+/** Back to the session's own tip: from HEAD when HEAD has it, else removed. */
+async function restorePath(write, session, top) {
+    const cwd = session.ref.path;
+    const inHead = (await write.git.run(['cat-file', '-e', `HEAD:${top}`], { cwd, allowFailure: true })).exitCode === 0;
+    if (inHead) {
+        await write.git.run(['restore', '--source=HEAD', '--staged', '--worktree', '--', top], { cwd, allowFailure: true });
+    }
+    else {
+        await write.git.run(['rm', '-q', '--cached', '--ignore-unmatch', '--', top], { cwd, allowFailure: true });
+        await rm(path.join(cwd, top), { recursive: true, force: true });
+    }
+}
+/** Under the write mutex. */
+export async function ctxrWriteTool(ctx, email, args) {
+    const session = await ownedSession(ctx.write, email, args.session);
+    if (await rebaseInProgress(ctx.write.git, session.ref.path)) {
+        throw new ToolRefusal('mcp.rebase_in_progress', `A rebase is in progress in ${session.name}; finish it with session_rebase (continue: true or abort: true) before running commands in it.`, { session: session.name });
+    }
+    const checked = checkArguments(args.args, CTXR_WRITE_COMMANDS, 'ctxr_write', ctx.write.config, session.root);
+    const usesInput = checked.argv.some((a) => a === INPUT_ARGUMENT || a.endsWith(`=${INPUT_ARGUMENT}`));
+    if (usesInput && args.input === undefined)
+        throw invalid(`An argument is "${INPUT_ARGUMENT}" but no "input" text was given.`);
+    const cwd = session.ref.storeRoot;
+    const cacheDir = cacheDirOf(ctx.write, cwd);
+    let inputFile = null;
+    let argv = checked.argv;
+    if (usesInput) {
+        await mkdir(cacheDir, { recursive: true });
+        inputFile = path.join(cacheDir, `input-${randomBytes(6).toString('hex')}.txt`);
+        await writeFile(inputFile, args.input, { flag: 'wx' });
+        argv = argv.map((a) => (a === INPUT_ARGUMENT ? inputFile : a.endsWith(`=${INPUT_ARGUMENT}`) ? `${a.slice(0, -INPUT_ARGUMENT.length)}${inputFile}` : a));
+    }
+    const before = await protectedChanges(ctx.write, session);
+    let run;
+    try {
+        run = await runServerCli({ entry: ctx.entry, argv: finalArgv(argv), cwd, env: childEnv(ctx.write.env, cwd, cacheDir), timeoutMs: ctx.timeoutMs });
+    }
+    finally {
+        if (inputFile !== null)
+            await unlink(inputFile).catch(() => undefined);
+    }
+    // D5, revision 7: whatever the command derived, a protected change it made does not stay.
+    const restored = [];
+    for (const [top, after] of await protectedChanges(ctx.write, session)) {
+        if (before.get(top)?.state === after.state)
+            continue;
+        await restorePath(ctx.write, session, top);
+        restored.push(top);
+    }
+    if (restored.length > 0) {
+        const prefix = await repoPrefixOf(ctx.write);
+        const shown = restored.map((top) => (top.startsWith(prefix) ? `${session.root}${top.slice(prefix.length)}` : top));
+        throw new ToolRefusal('mcp.path_protected', `The command changed ${shown.map((p) => `"${p}"`).join(', ')}, which cannot be changed from here, so ${restored.length === 1 ? 'that change was' : 'those changes were'} undone and the call refused. Other changes it made stay in the session.`, { paths: shown, exit_code: run.exit_code, stdout: run.stdout, stderr: run.stderr });
+    }
+    return { command: checked.command, args: checked.argv, ...run, ran_against: { session: session.name, root: session.root } };
+}
+export function renderCli(data) {
+    const r = data;
+    const against = 'session' in r.ran_against ? `session ${r.ran_against.session}` : `commit ${r.ran_against.commit.slice(0, 12)}`;
+    const head = r.timed_out ? `ctxr ${r.args.join(' ')} was stopped after the time limit (against ${against}).` : `ctxr ${r.args.join(' ')} exited ${r.exit_code} (against ${against}).`;
+    const parts = [head];
+    if (r.stdout !== '')
+        parts.push(r.stdout.replace(/\n$/, '') + (r.stdout_truncated ? '\n[output cut at the size limit]' : ''));
+    if (r.stderr !== '')
+        parts.push(`[stderr]\n${r.stderr.replace(/\n$/, '')}${r.stderr_truncated ? '\n[cut at the size limit]' : ''}`);
+    return parts.join('\n\n');
+}
+//# sourceMappingURL=cli.js.map

package/dist/core/mcp/tools/cli.js.map

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

package/dist/core/mcp/tools/edit.d.ts

@@ -1,12 +1,14 @@
-import { type WriteDeps } from '../sessions.js';
-import type { McpView, SyncDeps } from '../sync.js';
+import type { WriteDeps } from '../sessions.js';
 /**
- * serve-the-store-over-mcp design.md D13 (remote-access spec, *`Edit` and
- * `Write` collect in one draft pull request per member*): Claude Code's Edit
- * and Write, landing as commits on the member's draft — one session, one pull
- * request, reviewed on the approval page. A call first publishes whatever the
- * draft left unpublished, and a retry whose effect is already in the draft is
- * answered without a second commit, so a failure partway never strands a change.
+ * serve-the-session-lifecycle-to-chat-apps D1, D2, D5 (remote-access spec,
+ * *`Edit`, `Write`, `Move` and `Delete` change a member's own session and
+ * commit nothing*): Claude Code's Edit and Write, with their parameters
+ * unchanged, plus `Move` and `Delete` for the `git mv` and `git rm` a local
+ * agent runs. Each addresses a file under the root of a session the caller
+ * owns and changes that session's working tree only; nothing commits,
+ * pushes or opens a pull request until `session_submit`. Uncommitted rest
+ * between calls is the session's normal state, as the lifecycle skill says.
+ * The per-member draft these replaced is gone.
  */
 export interface EditArgs {
     file_path: string;
@@ -18,12 +20,19 @@ export interface WriteArgs {
     file_path: string;
     content: string;
 }
+export interface MoveArgs {
+    source_path: string;
+    destination_path: string;
+}
+export interface DeleteArgs {
+    file_path: string;
+}
 export declare const EDIT_INPUT_SCHEMA: {
     readonly type: 'object';
     readonly properties: {
         readonly file_path: {
             readonly type: 'string';
-            readonly description: 'The note to modify, relative to the store root, e.g. "projects/kestrel.md".';
+            readonly description: "The file to modify, under the session root session_start returned, e.g. \"<root>projects/kestrel.md\".";
         };
         readonly old_string: {
             readonly type: 'string';
@@ -45,35 +54,60 @@ export declare const WRITE_INPUT_SCHEMA: {
     readonly properties: {
         readonly file_path: {
             readonly type: 'string';
-            readonly description: 'The new note to create, relative to the store root, e.g. "projects/kestrel-launch.md".';
+            readonly description: "The new file to create, under the session root session_start returned, e.g. \"<root>projects/kestrel.md\".";
         };
         readonly content: {
             readonly type: 'string';
-            readonly description: 'The content to write to the note';
+            readonly description: 'The content to write to the file';
         };
     };
     readonly required: readonly ['file_path', 'content'];
 };
+export declare const MOVE_INPUT_SCHEMA: {
+    readonly type: 'object';
+    readonly properties: {
+        readonly source_path: {
+            readonly type: 'string';
+            readonly description: "The file to move, under the session root session_start returned, e.g. \"<root>projects/kestrel.md\".";
+        };
+        readonly destination_path: {
+            readonly type: 'string';
+            readonly description: 'Where it goes, under the same session root. Must not exist yet.';
+        };
+    };
+    readonly required: readonly ['source_path', 'destination_path'];
+};
+export declare const DELETE_INPUT_SCHEMA: {
+    readonly type: 'object';
+    readonly properties: {
+        readonly file_path: {
+            readonly type: 'string';
+            readonly description: "The file to delete, under the session root session_start returned, e.g. \"<root>projects/kestrel.md\".";
+        };
+    };
+    readonly required: readonly ['file_path'];
+};
+/** D5: `Edit` and `Write` stay text only, with this cap. */
+export declare const MAX_CONTENT_BYTES: number;
 export declare function parseEditArgs(args: Record<string, unknown>): EditArgs;
 export declare function parseWriteArgs(args: Record<string, unknown>): WriteArgs;
-export interface DraftContext {
-    view: McpView;
-    syncDeps: SyncDeps;
-    write: WriteDeps;
-}
-export interface DraftResult {
+export declare function parseMoveArgs(args: Record<string, unknown>): MoveArgs;
+export declare function parseDeleteArgs(args: Record<string, unknown>): DeleteArgs;
+export interface FileChangeResult {
+    /** The path as the tools address it: the session root, then the path inside it. */
     file_path: string;
-    changed: boolean;
-    /** Set when a retried call's effect was already in the draft: nothing new was committed. */
-    already_applied: boolean;
-    commit: string;
-    pull_request: {
-        number: number;
-        url: string;
-    };
-    approval_url: string;
+    session: string;
+    /** `Move` only: where the file went. */
+    destination_path?: string;
+    committed: false;
     message: string;
 }
-export declare function editTool(ctx: DraftContext, email: string, args: EditArgs): Promise<DraftResult>;
-export declare function writeTool(ctx: DraftContext, email: string, args: WriteArgs): Promise<DraftResult>;
+/** Under the write mutex. */
+export declare function editTool(write: WriteDeps, email: string, args: EditArgs): Promise<FileChangeResult>;
+/** Under the write mutex. Never overwrites. */
+export declare function writeTool(write: WriteDeps, email: string, args: WriteArgs): Promise<FileChangeResult>;
+/** Under the write mutex. A tracked file moves as `git mv` moves it, so the session shows a rename. */
+export declare function moveTool(write: WriteDeps, email: string, args: MoveArgs): Promise<FileChangeResult>;
+/** Under the write mutex. Destructive: the working-tree copy is gone, though a committed version stays in history. */
+export declare function deleteTool(write: WriteDeps, email: string, args: DeleteArgs): Promise<FileChangeResult>;
 //# sourceMappingURL=edit.d.ts.map

package/dist/core/mcp/tools/edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../../src/core/mcp/tools/edit.ts"],"names":[],"mappings":"AAUA,OAAO,EAAyF,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACvI,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGpD;;;;;;;GAOG;AAEH,MAAM,WAAW,QAAQ;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,iBAAiB;aAC5B,IAAI,EAAE,QAAQ;aACd,UAAU;iBACR,SAAS;qBAAI,IAAI,EAAE,QAAQ;qBAAE,WAAW,EAAE,6EAA6E;;iBACvH,UAAU;qBAAI,IAAI,EAAE,QAAQ;qBAAE,WAAW,EAAE,qBAAqB;;iBAChE,UAAU;qBAAI,IAAI,EAAE,QAAQ;qBAAE,WAAW,EAAE,iEAAiE;;iBAC5G,WAAW;qBAAI,IAAI,EAAE,SAAS;qBAAE,WAAW,EAAE,uDAAuD;;;aAEtG,QAAQ,YAAG,WAAW,EAAE,YAAY,EAAE,YAAY;CAC1C,CAAC;AAEX,eAAO,MAAM,kBAAkB;aAC7B,IAAI,EAAE,QAAQ;aACd,UAAU;iBACR,SAAS;qBAAI,IAAI,EAAE,QAAQ;qBAAE,WAAW,EAAE,wFAAwF;;iBAClI,OAAO;qBAAI,IAAI,EAAE,QAAQ;qBAAE,WAAW,EAAE,kCAAkC;;;aAE5E,QAAQ,YAAG,WAAW,EAAE,SAAS;CACzB,CAAC;AAIX,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,CAQrE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAMvE;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,4FAA4F;IAC5F,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AA0ID,wBAAsB,QAAQ,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAgBrG;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAYvG"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../../src/core/mcp/tools/edit.ts"],"names":[],"mappings":"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"}