sema-core 1.0.14 → 2.0.0

package/dist/util/diff.js

@@ -6,121 +6,80 @@ exports.getDiffContent = getDiffContent;
 const diff_1 = require("diff");
 const path_1 = require("path");
 const cwd_1 = require("./cwd");
-const CONTEXT_LINES = 3;
-// For some reason, & confuses the diff library, so we replace it with a token,
-// then substitute it back in after the diff is computed.
-const AMPERSAND_TOKEN = '<<:AMPERSAND_TOKEN:>>';
-const DOLLAR_TOKEN = '<<:DOLLAR_TOKEN:>>';
-function getPatch({ filePath, fileContents, oldStr, newStr, }) {
-    return (0, diff_1.structuredPatch)(filePath, filePath, fileContents.replaceAll('&', AMPERSAND_TOKEN).replaceAll('$', DOLLAR_TOKEN), fileContents
-        .replaceAll('&', AMPERSAND_TOKEN)
-        .replaceAll('$', DOLLAR_TOKEN)
-        .replace(oldStr.replaceAll('&', AMPERSAND_TOKEN).replaceAll('$', DOLLAR_TOKEN), newStr.replaceAll('&', AMPERSAND_TOKEN).replaceAll('$', DOLLAR_TOKEN)), undefined, undefined, { context: CONTEXT_LINES }).hunks.map(_ => ({
-        ..._,
-        lines: _.lines.map(_ => _.replaceAll(AMPERSAND_TOKEN, '&').replaceAll(DOLLAR_TOKEN, '$')),
+const PATCH_SURROUNDING_LINES = 3;
+const SPECIAL_CHAR_MARKERS = {
+    '&': '<<:AMPERSAND:>>',
+    '$': '<<:DOLLAR:>>',
+};
+function escapeSpecialChars(str) {
+    return Object.entries(SPECIAL_CHAR_MARKERS).reduce((s, [char, marker]) => s.replaceAll(char, marker), str);
+}
+function unescapeSpecialChars(str) {
+    return Object.entries(SPECIAL_CHAR_MARKERS).reduce((s, [char, marker]) => s.replaceAll(marker, char), str);
+}
+function getPatch({ filePath, fileContents, oldStr, newStr }) {
+    const escape = escapeSpecialChars;
+    const oldContent = escape(fileContents);
+    const newContent = oldContent.replace(escape(oldStr), escape(newStr));
+    const { hunks } = (0, diff_1.structuredPatch)(filePath, filePath, oldContent, newContent, '', '', {
+        context: PATCH_SURROUNDING_LINES,
+    });
+    return hunks.map(hunk => ({
+        ...hunk,
+        lines: hunk.lines.map(unescapeSpecialChars),
     }));
 }
 // 获取更新摘要信息
-function getUpdateSummary(filePath, structuredPatch) {
-    const patches = Array.isArray(structuredPatch) ? structuredPatch : [];
-    const relativePath = (0, path_1.relative)((0, cwd_1.getCwd)(), filePath);
-    // 计算添加和删除的行数
-    const numAdditions = patches.reduce((count, hunk) => count + hunk.lines.filter(_ => _.startsWith('+')).length, 0);
-    const numRemovals = patches.reduce((count, hunk) => count + hunk.lines.filter(_ => _.startsWith('-')).length, 0);
-    // 构建基础信息
-    let result = `Updated ${relativePath}`;
-    if (numAdditions > 0 || numRemovals > 0) {
-        result += ' with ';
-        const changes = [];
-        if (numAdditions > 0) {
-            changes.push(`${numAdditions} ${numAdditions > 1 ? 'additions' : 'addition'}`);
-        }
-        if (numRemovals > 0) {
-            changes.push(`${numRemovals} ${numRemovals > 1 ? 'removals' : 'removal'}`);
-        }
-        result += changes.join(' and ');
+function getUpdateSummary(filePath, patches) {
+    const hunks = patches ?? [];
+    const relativePath = (0, path_1.relative)((0, cwd_1.readInitialCwd)(), filePath);
+    const countLines = (prefix) => hunks.reduce((count, hunk) => count + hunk.lines.filter(l => l.startsWith(prefix)).length, 0);
+    const numAdditions = countLines('+');
+    const numRemovals = countLines('-');
+    if (numAdditions === 0 && numRemovals === 0) {
+        return `Updated ${relativePath}`;
     }
-    return result;
+    const pluralize = (n, word) => `${n} ${n > 1 ? word + 's' : word}`;
+    const changes = [
+        numAdditions > 0 && pluralize(numAdditions, 'addition'),
+        numRemovals > 0 && pluralize(numRemovals, 'removal'),
+    ].filter(Boolean);
+    return `Updated ${relativePath} with ${changes.join(' and ')}`;
 }
 // 获取代码diff片段
-function getDiffContent(structuredPatch) {
-    const patches = Array.isArray(structuredPatch) ? structuredPatch : [];
-    if (patches.length === 0) {
+function getDiffContent(patches) {
+    const hunks = patches ?? [];
+    if (hunks.length === 0)
         return '';
-    }
-    let result = '';
-    patches.forEach((hunk, index) => {
-        if (index > 0) {
-            result += '\n...\n';
-        }
-        // 格式化每个hunk的行
-        const formattedLines = formatDiffLines(hunk.lines, hunk.oldStart);
-        result += formattedLines.join('\n') + '\n';
-    });
-    return result;
+    return hunks
+        .map(hunk => formatDiffLines(hunk.lines, hunk.oldStart).join('\n') + '\n')
+        .join('\n...\n');
 }
 // 格式化diff行，使用5位行号 + 标识符 + 代码的格式
-function formatDiffLines(lines, startingLineNumber) {
-    const numberedLines = numberDiffLines(lines.map(code => {
-        if (code.startsWith('+')) {
-            return {
-                code: code.slice(1), // 移除开头的+/-符号
-                type: 'add',
-            };
-        }
-        if (code.startsWith('-')) {
-            return {
-                code: code.slice(1), // 移除开头的+/-符号
-                type: 'remove',
-            };
-        }
-        return { code, type: 'nochange' };
-    }), startingLineNumber);
-    return numberedLines.map(({ type, code, i }) => {
-        const lineNumber = i.toString().padStart(5); // 5位行号
-        const changeChar = type === 'add' ? '+' : type === 'remove' ? '-' : ' ';
-        return `${lineNumber}${changeChar}${code}`;
-    });
-}
-// 为diff行分配行号
-function numberDiffLines(diff, startLine) {
-    let i = startLine;
+function formatDiffLines(lines, startLine) {
+    const markerMap = { '+': '+', '-': '-' };
     const result = [];
-    const queue = [...diff];
-    while (queue.length > 0) {
-        const { code, type } = queue.shift();
-        const line = {
-            code: code,
-            type,
-            i,
-        };
-        // 根据变更类型更新计数器
-        switch (type) {
-            case 'nochange':
-                i++;
-                result.push(line);
-                break;
-            case 'add':
-                i++;
-                result.push(line);
-                break;
-            case 'remove': {
-                result.push(line);
-                let numRemoved = 0;
-                while (queue[0]?.type === 'remove') {
-                    const { code, type } = queue.shift();
-                    const line = {
-                        code: code,
-                        type,
-                        i: i + numRemoved + 1,
-                    };
-                    result.push(line);
-                    numRemoved++;
-                }
-                i -= numRemoved;
-                break;
-            }
+    let lineNum = startLine;
+    for (let idx = 0; idx < lines.length;) {
+        const prefix = lines[idx][0];
+        const code = prefix === '+' || prefix === '-' ? lines[idx].slice(1) : lines[idx];
+        const marker = markerMap[prefix] ?? ' ';
+        if (prefix !== '-') {
+            result.push(`${lineNum.toString().padStart(5)}${marker}${code}`);
+            lineNum++;
+            idx++;
+            continue;
+        }
+        // 连续 remove 行分组处理，显示旧文件行号
+        result.push(`${lineNum.toString().padStart(5)}-${code}`);
+        idx++;
+        let extraRemoves = 0;
+        while (idx < lines.length && lines[idx][0] === '-') {
+            result.push(`${(lineNum + extraRemoves + 1).toString().padStart(5)}-${lines[idx].slice(1)}`);
+            extraRemoves++;
+            idx++;
         }
+        lineNum -= extraRemoves;
     }
     return result;
 }

package/dist/util/diff.js.map

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

package/dist/{tools/Edit/utils.d.ts → util/edit.d.ts}

@@ -1,10 +1,7 @@
 import { type Hunk } from 'diff';
-/**
- * Applies an edit to a file and returns the patch and updated file.
- * Does not write the file to disk.
- */
+export declare function normalizeLF(str: string): string;
 export declare function applyEdit(file_path: string, old_string: string, new_string: string, replace_all?: boolean): {
     patch: Hunk[];
     updatedFile: string;
 };
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=edit.d.ts.map

package/dist/util/edit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/util/edit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,MAAM,CAAA;AAGhC,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,SAAS,CACvB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,GAAE,OAAe,GAC3B;IAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAuCxC"}

package/dist/util/edit.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeLF = normalizeLF;
+exports.applyEdit = applyEdit;
+const fs_1 = require("fs");
+const file_1 = require("./file");
+const diff_1 = require("./diff");
+function normalizeLF(str) {
+    return str.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+}
+function applyEdit(file_path, old_string, new_string, replace_all = false) {
+    const fullFilePath = (0, file_1.canonicalizeFilePath)(file_path);
+    let originalFile;
+    let updatedFile;
+    if (old_string === '') {
+        originalFile = '';
+        updatedFile = normalizeLF(new_string);
+    }
+    else {
+        const enc = (0, file_1.inferFileEncoding)(fullFilePath);
+        originalFile = normalizeLF((0, fs_1.readFileSync)(fullFilePath, enc));
+        const oldStr = normalizeLF(old_string);
+        const newStr = normalizeLF(new_string);
+        const doReplace = replace_all
+            ? (s, from, to) => s.replaceAll(from, to)
+            : (s, from, to) => s.replace(from, to);
+        // 删除操作时，尝试连带删除尾部换行以避免留空行
+        const searchStr = newStr === '' && !oldStr.endsWith('\n') && originalFile.includes(oldStr + '\n')
+            ? oldStr + '\n'
+            : oldStr;
+        updatedFile = doReplace(originalFile, searchStr, newStr);
+        if (updatedFile === originalFile) {
+            throw new Error('No changes detected, edit failed.');
+        }
+    }
+    const patch = (0, diff_1.getPatch)({
+        filePath: file_path,
+        fileContents: originalFile,
+        oldStr: originalFile,
+        newStr: updatedFile,
+    });
+    return { patch, updatedFile };
+}
+//# sourceMappingURL=edit.js.map

package/dist/util/edit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/util/edit.ts"],"names":[],"mappings":";;AAKA,kCAEC;AAED,8BA4CC;AArDD,2BAAiC;AACjC,iCAAgE;AAEhE,iCAAiC;AAEjC,SAAgB,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AACxD,CAAC;AAED,SAAgB,SAAS,CACvB,SAAiB,EACjB,UAAkB,EAClB,UAAkB,EAClB,cAAuB,KAAK;IAE5B,MAAM,YAAY,GAAG,IAAA,2BAAoB,EAAC,SAAS,CAAC,CAAA;IAEpD,IAAI,YAAoB,CAAA;IACxB,IAAI,WAAmB,CAAA;IAEvB,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACtB,YAAY,GAAG,EAAE,CAAA;QACjB,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAA;QAC3C,YAAY,GAAG,WAAW,CAAC,IAAA,iBAAY,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAA;QAE3D,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAA;QACtC,MAAM,SAAS,GAAG,WAAW;YAC3B,CAAC,CAAC,CAAC,CAAS,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YACjE,CAAC,CAAC,CAAC,CAAS,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAEhE,yBAAyB;QACzB,MAAM,SAAS,GAAG,MAAM,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;YAC/F,CAAC,CAAC,MAAM,GAAG,IAAI;YACf,CAAC,CAAC,MAAM,CAAA;QAEV,WAAW,GAAG,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAExD,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,eAAQ,EAAC;QACrB,QAAQ,EAAE,SAAS;QACnB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,WAAW;KACpB,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AAC/B,CAAC"}

package/dist/util/env.d.ts

@@ -1,5 +1,2 @@
-export declare const env: {
-    platform: string;
-};
-export declare const getEnv: (() => Promise<string>) & import("lodash").MemoizedFunction;
+export declare function getEnv(): Promise<string>;
 //# sourceMappingURL=env.d.ts.map

package/dist/util/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,GAAG;;CAEf,CAAA;AAED,eAAO,MAAM,MAAM,SAAqB,OAAO,CAAC,MAAM,CAAC,qCAWrD,CAAA"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":"AAQA,wBAAsB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAsB9C"}

package/dist/util/env.js

@@ -3,24 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnv = exports.env = void 0;
-const lodash_es_1 = require("lodash-es");
+exports.getEnv = getEnv;
 const os_1 = __importDefault(require("os"));
 const git_1 = require("./git");
 const cwd_1 = require("./cwd");
+const shell_1 = require("./shell");
 const platform_1 = require("./platform");
-exports.env = {
-    platform: platform_1.IS_WIN ? 'windows' : platform_1.IS_MAC ? 'macos' : 'linux',
-};
-exports.getEnv = (0, lodash_es_1.memoize)(async () => {
-    const cwd = (0, cwd_1.getOriginalCwd)();
+let cached;
+async function getEnv() {
+    if (cached)
+        return cached;
+    const cwd = (0, cwd_1.readInitialCwd)();
     const isGitRepo = await (0, git_1.getIsGit)();
-    const osVersion = os_1.default.release();
-    const today = new Date().toISOString().split('T')[0];
-    return `Working directory: ${cwd}
-Is directory a git repo: ${isGitRepo ? 'Yes' : 'No'}
-Platform: ${process.platform}
-OS Version: ${os_1.default.type()} ${osVersion}
-Today's date: ${today}`;
-});
+    const lines = [
+        `Working dir: ${cwd}`,
+        `Is a Git repo: ${isGitRepo ? 'Yes' : 'No'}`,
+        `Platform: ${process.platform}`,
+        `OS: ${os_1.default.type()} ${os_1.default.release()}`,
+    ];
+    if (platform_1.IS_WIN) {
+        const shell = (0, shell_1.getShellRuntimeInfo)();
+        lines.push(`Shell type: ${shell?.type ?? 'unknown'}`);
+        if (shell?.bin)
+            lines.push(`Shell binary: ${shell.bin}`);
+    }
+    cached = lines.join('\n');
+    return cached;
+}
 //# sourceMappingURL=env.js.map

package/dist/util/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,4CAAmB;AACnB,+BAAgC;AAChC,+BAAsC;AACtC,yCAA2C;AAE9B,QAAA,GAAG,GAAG;IACjB,QAAQ,EAAE,iBAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;CAC1D,CAAA;AAEY,QAAA,MAAM,GAAG,IAAA,mBAAO,EAAC,KAAK,IAAqB,EAAE;IACxD,MAAM,GAAG,GAAG,IAAA,oBAAc,GAAE,CAAA;IAC5B,MAAM,SAAS,GAAG,MAAM,IAAA,cAAQ,GAAE,CAAA;IAClC,MAAM,SAAS,GAAG,YAAE,CAAC,OAAO,EAAE,CAAA;IAC9B,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAEpD,OAAO,sBAAsB,GAAG;2BACP,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACvC,OAAO,CAAC,QAAQ;cACd,YAAE,CAAC,IAAI,EAAE,IAAI,SAAS;gBACpB,KAAK,EAAE,CAAA;AACvB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":";;;;;AAQA,wBAsBC;AA9BD,4CAAmB;AACnB,+BAAgC;AAChC,+BAAsC;AACtC,mCAA6C;AAC7C,yCAAmC;AAEnC,IAAI,MAA0B,CAAA;AAEvB,KAAK,UAAU,MAAM;IAC1B,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,MAAM,GAAG,GAAG,IAAA,oBAAc,GAAE,CAAA;IAC5B,MAAM,SAAS,GAAG,MAAM,IAAA,cAAQ,GAAE,CAAA;IAElC,MAAM,KAAK,GAAG;QACZ,gBAAgB,GAAG,EAAE;QACrB,kBAAkB,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;QAC5C,aAAa,OAAO,CAAC,QAAQ,EAAE;QAC/B,OAAO,YAAE,CAAC,IAAI,EAAE,IAAI,YAAE,CAAC,OAAO,EAAE,EAAE;KACnC,CAAA;IAED,IAAI,iBAAM,EAAE,CAAC;QACX,MAAM,KAAK,GAAG,IAAA,2BAAmB,GAAE,CAAA;QACnC,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,CAAC,CAAA;QACrD,IAAI,KAAK,EAAE,GAAG;YAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEzB,OAAO,MAAM,CAAA;AACf,CAAC"}

package/dist/util/fetchUrl.d.ts

@@ -0,0 +1,18 @@
+export declare const FETCH_URL_MAX_MARKDOWN_LEN = 50000;
+export type FetchUrlResult = {
+    content: string;
+    bytes: number;
+    code: number;
+    codeText: string;
+    contentType: string;
+};
+type RedirectRecord = {
+    type: 'redirect';
+    originalUrl: string;
+    redirectUrl: string;
+    statusCode: number;
+};
+export declare function fetchUrlAsMarkdown(url: string, abortController: AbortController): Promise<FetchUrlResult | RedirectRecord>;
+export declare function injectPromptIntoMarkdown(prompt: string, markdownContent: string, signal: AbortSignal): Promise<string>;
+export {};
+//# sourceMappingURL=fetchUrl.d.ts.map

package/dist/util/fetchUrl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchUrl.d.ts","sourceRoot":"","sources":["../../src/util/fetchUrl.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,0BAA0B,QAAS,CAAA;AAEhD,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAQD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC,CAsE1C;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,CAiBjB"}

package/dist/util/fetchUrl.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FETCH_URL_MAX_MARKDOWN_LEN = void 0;
+exports.fetchUrlAsMarkdown = fetchUrlAsMarkdown;
+exports.injectPromptIntoMarkdown = injectPromptIntoMarkdown;
+const log_1 = require("./log");
+const fetchUrl_1 = require("../prompt/tools/fetchUrl");
+const queryLLM_1 = require("../services/api/queryLLM");
+const MAX_CONTENT_BYTES = 5 * 1024 * 1024; // 5MB
+const TIMEOUT_MS = 30_000;
+exports.FETCH_URL_MAX_MARKDOWN_LEN = 50_000;
+function createTurndown() {
+    const mod = require('turndown');
+    const Ctor = mod.default ?? mod;
+    return new Ctor();
+}
+async function fetchUrlAsMarkdown(url, abortController) {
+    try {
+        const parsed = new URL(url);
+        if (url.length > 1000 || parsed.username || parsed.password || !parsed.hostname.includes('.')) {
+            throw new Error('The provided URL is not valid.');
+        }
+    }
+    catch (e) {
+        throw e instanceof Error && e.message === 'The provided URL is not valid.' ? e : new Error('The provided URL is not valid.');
+    }
+    // http -> https
+    try {
+        const parsed = new URL(url);
+        if (parsed.protocol === 'http:') {
+            parsed.protocol = 'https:';
+            url = parsed.toString();
+        }
+    }
+    catch { }
+    const originalOrigin = new URL(url).origin;
+    const timer = setTimeout(() => abortController.abort(), TIMEOUT_MS);
+    let response;
+    try {
+        response = await globalThis.fetch(url, {
+            signal: abortController.signal,
+            redirect: 'follow',
+            headers: {
+                Accept: 'text/markdown, text/html, */*',
+                'User-Agent': 'sema-code-core/1.0 fetch_url',
+            },
+        });
+    }
+    finally {
+        clearTimeout(timer);
+    }
+    // 检测跨域重定向
+    if (response.redirected && response.url) {
+        const finalOrigin = new URL(response.url).origin;
+        if (finalOrigin !== originalOrigin) {
+            return {
+                type: 'redirect',
+                originalUrl: url,
+                redirectUrl: response.url,
+                statusCode: 301,
+            };
+        }
+    }
+    const rawBuffer = Buffer.from(await response.arrayBuffer());
+    if (rawBuffer.length > MAX_CONTENT_BYTES) {
+        throw new Error(`Response body too large: ${rawBuffer.length} bytes (limit ${MAX_CONTENT_BYTES})`);
+    }
+    const contentType = response.headers.get('content-type') ?? '';
+    let content = rawBuffer.toString('utf-8');
+    if (contentType.includes('text/html')) {
+        try {
+            content = createTurndown().turndown(content);
+        }
+        catch { }
+    }
+    return {
+        bytes: rawBuffer.length,
+        code: response.status,
+        codeText: response.statusText,
+        content,
+        contentType,
+    };
+}
+async function injectPromptIntoMarkdown(prompt, markdownContent, signal) {
+    const truncated = markdownContent.length > exports.FETCH_URL_MAX_MARKDOWN_LEN
+        ? markdownContent.slice(0, exports.FETCH_URL_MAX_MARKDOWN_LEN) + '\n\n[Content trimmed — exceeded length limit.]'
+        : markdownContent;
+    const userPrompt = (0, fetchUrl_1.buildSecondaryModelPrompt)(truncated, prompt);
+    try {
+        const { message } = await (0, queryLLM_1.queryQuick)({ userPrompt, signal });
+        const firstBlock = message.content[0];
+        return firstBlock && 'text' in firstBlock ? firstBlock.text : 'The model returned an empty response.';
+    }
+    catch (e) {
+        if (signal.aborted)
+            throw new Error('AbortError');
+        (0, log_1.logError)(e);
+        return 'Content processing by the model failed.';
+    }
+}
+//# sourceMappingURL=fetchUrl.js.map

package/dist/util/fetchUrl.js.map

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

package/dist/util/file.d.ts

@@ -1,77 +1,64 @@
-export type File = {
-    filename: string;
-    content: string;
-};
-export type LineEndingType = 'CRLF' | 'LF';
-export declare function glob(filePattern: string, cwd: string, { limit, offset }: {
+export type LineEndingKind = 'CRLF' | 'LF';
+export declare function globFiles(filePattern: string, cwd: string, { limit, offset }: {
     limit: number;
     offset: number;
 }, abortSignal: AbortSignal): Promise<{
     files: string[];
     truncated: boolean;
 }>;
-export declare function readFileSafe(filepath: string): string | null;
+/**
+ * 判断目标路径是否在工作目录内部
+ */
 export declare function isInDirectory(relativePath: string, relativeCwd: string): boolean;
+/**
+ * 读取文本文件内容，自动标准化换行符为 LF
+ */
 export declare function readTextContent(filePath: string, offset?: number, maxLines?: number): {
     content: string;
     lineCount: number;
     totalLines: number;
 };
-export declare function writeTextContent(filePath: string, content: string, encoding: BufferEncoding, endings: LineEndingType): void;
-export declare function detectRepoLineEndings(filePath: string): Promise<LineEndingType | undefined>;
-export declare function detectRepoLineEndingsDirect(cwd: string): Promise<LineEndingType>;
-export declare function detectFileEncoding(filePath: string): BufferEncoding;
-export declare function detectFileEncodingDirect(filePath: string): BufferEncoding;
-export declare function detectLineEndings(filePath: string): LineEndingType;
-export declare function detectLineEndingsDirect(filePath: string, encoding?: BufferEncoding): LineEndingType;
 /**
- * 为命令行执行包裹路径引号（仅 Windows 且路径包含空格时）
+ * 写入文本文件，按指定换行符格式输出
  */
-export declare function quotePathForShell(filePath: string): string;
-export declare function normalizeFilePath(filePath: string): string;
+export declare function writeTextFile(filePath: string, content: string, encoding: BufferEncoding, endings: LineEndingKind): void;
+export declare function inferFileEncoding(filePath: string): BufferEncoding;
+export declare function inferLineEndings(filePath: string): LineEndingKind;
+export declare function canonicalizeFilePath(filePath: string): string;
 /**
- * 标准化 Skill 路径，处理 Windows 环境下的 Unix 风格路径，但不强制转换为绝对路径
- * 用于 skill 系统中需要保持路径结构的场景
+ * 在同目录下查找同名但不同扩展名的文件
  */
-export declare function normalizeSkillPath(filePath: string): string;
-export declare function getAbsolutePath(path: string | undefined): string | undefined;
-export declare function getAbsoluteAndRelativePaths(path: string | undefined): {
-    absolutePath: string | undefined;
-    relativePath: string | undefined;
-};
+export declare function findFileWithDifferentExt(filePath: string): string | undefined;
 /**
- * Find files with the same name but different extensions in the same directory
- * @param filePath The path to the file that doesn't exist
- * @returns The found file with a different extension, or undefined if none found
+ * 为文本内容添加行号（cat -n 风格）
  */
-export declare function findSimilarFile(filePath: string): string | undefined;
-/**
- * Adds cat -n style line numbers to the content
- */
-export declare function addLineNumbers({ content, startLine, }: {
+export declare function formatWithLineNumbers({ content, startLine, }: {
     content: string;
     startLine: number;
 }): string;
-/**
- * Checks if a directory is empty by efficiently reading just the first entry
- * @param dirPath The path to the directory to check
- * @returns true if the directory is empty, false otherwise
- */
-export declare function isDirEmpty(dirPath: string): boolean;
 /**
  * 在 JSON.stringify(data, null, 2) 生成的文本中，查找包含 match 的对象块行范围。
  *
  * 算法：找到 match 所在行，往回找最近的含 '{' 的行作为对象起始，
  * 记录该行缩进，然后往下找同缩进的 '}' 行作为对象结束。
  *
- * @param json  JSON 文本（需 2-space 缩进格式）
- * @param match 匹配文本，如 `"id": "abc123"` 或 `"sequential-thinking"`
- * @returns [startLine, endLine]（1-based），未找到返回 undefined
  */
 export declare function findJsonObjectLineRange(json: string, match: string): [number, number] | undefined;
 /**
- * 在 JSON 文件中查找指定 key 对应对象的行范围，返回 "filePath:startLine-endLine"
- * 找不到则返回纯 filePath
+ * 获取相对于初始工作目录的显示路径，超出范围则返回绝对路径
+ */
+export declare function getDisplayPath(filePath: string): string;
+/**
+ * 获取文件路径（从工具输入中）
  */
-export declare function calcJsonKeyLineRange(filePath: string, key: string): string;
+export declare function getFilePath(input: {
+    [key: string]: unknown;
+}): string | undefined;
+interface ExecResult {
+    stdout: string;
+    stderr: string;
+    code: number;
+}
+export declare function execFileSafely(file: string, args: string[], abortSignal?: AbortSignal, timeout?: number, preserveOutputOnError?: boolean, cwd?: string): Promise<ExecResult>;
+export {};
 //# sourceMappingURL=file.d.ts.map

package/dist/util/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"AA4BA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1C,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACpD,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAiBlD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,GAClB,OAAO,CAqCT;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,MAAM,SAAI,EACV,QAAQ,CAAC,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAmB5D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,cAAc,GACtB,IAAI,CAON;AAoCD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAuBlE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAajE;AAID,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAgB7D;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsB7E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,SAAS,GACV,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,GAAG,MAAM,CAOT;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CA6BjG;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAEjF;AAQD,UAAU,UAAU;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACb;AAGD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,WAAW,CAAC,EAAE,WAAW,EACzB,OAAO,SAAuB,EAC9B,qBAAqB,UAAO,EAC5B,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC,CAsBrB"}