agentsw 0.6.1 → 0.7.0

package/dist/jsonc.js

@@ -0,0 +1,111 @@
+import fs from "node:fs";
+import { applyEdits, createScanner, getNodeValue, modify, parseTree, printParseErrorCode, } from "jsonc-parser";
+export function isJsonObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function parseJsoncObject(file, text) {
+    const source = text.startsWith("\uFEFF") ? text.slice(1) : text;
+    const errors = [];
+    const root = parseTree(source, errors, { allowTrailingComma: true });
+    const error = errors[0];
+    if (error) {
+        // Do not quote source text: config files can contain credentials.
+        throw new Error(`${file}: invalid JSONC (${printParseErrorCode(error.error)} at offset ${error.offset})`);
+    }
+    if (root?.type !== "object")
+        throw new Error(`${file}: expected a JSON object at the document root`);
+    // Parsing resolves duplicate keys last-wins, but modify edits the first occurrence.
+    // Reject that ambiguity at any depth rather than syncing a value the agent will not read.
+    const checkDuplicates = (node) => {
+        const names = node.type === "object" ? new Set() : undefined;
+        for (const child of node.children ?? []) {
+            if (names) {
+                const name = child.children[0].value;
+                if (names.has(name)) {
+                    throw new Error(`${file}: invalid JSONC (duplicate object property at offset ${child.offset})`);
+                }
+                names.add(name);
+            }
+            checkDuplicates(child);
+        }
+    };
+    checkDuplicates(root);
+    return getNodeValue(root);
+}
+/** Only missing files initialize to an empty object; unreadable or invalid files must not be replaced. */
+export function readJsoncObject(file) {
+    let text;
+    try {
+        text = fs.readFileSync(file, "utf8");
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return { file, text: "{}\n", value: {} };
+        throw error;
+    }
+    return { file, text, value: parseJsoncObject(file, text) };
+}
+function comments(text) {
+    const result = [];
+    const scanner = createScanner(text);
+    for (let token = scanner.scan(); token !== 17 /* SyntaxKind.EOF */; token = scanner.scan()) {
+        if (token === 12 /* SyntaxKind.LineCommentTrivia */ || token === 13 /* SyntaxKind.BlockCommentTrivia */) {
+            result.push(text.slice(scanner.getTokenOffset(), scanner.getTokenOffset() + scanner.getTokenLength()));
+        }
+    }
+    return result;
+}
+/** modify() may include adjacent comments in deletion ranges; retain them as detached comments. */
+function retainComments(text, edit, eol) {
+    const remaining = new Map();
+    for (const comment of comments(edit.content))
+        remaining.set(comment, (remaining.get(comment) ?? 0) + 1);
+    const removed = [];
+    for (const comment of comments(text.slice(edit.offset, edit.offset + edit.length))) {
+        const count = remaining.get(comment) ?? 0;
+        if (count)
+            remaining.set(comment, count - 1);
+        else
+            removed.push(comment);
+    }
+    return removed.length ? { ...edit, content: eol + removed.join(eol) + eol + edit.content } : edit;
+}
+/** Change only differing values, leaving unrelated fields, comments, and string literals intact. */
+export function editJsoncObject(document, value) {
+    const bom = document.text.startsWith("\uFEFF") ? "\uFEFF" : "";
+    let text = bom ? document.text.slice(1) : document.text;
+    const eol = text.includes("\r\n") ? "\r\n" : "\n";
+    const update = (location, previous, next) => {
+        if (previous === next)
+            return;
+        if (isJsonObject(previous) && isJsonObject(next)) {
+            const keys = Object.keys(next);
+            if (keys.length || !Object.keys(previous).length) {
+                // Add before deleting, so a trailing-comma object never temporarily loses its last property.
+                for (const key of keys)
+                    update([...location, key], previous[key], next[key]);
+                for (const key of Object.keys(previous)) {
+                    if (!Object.hasOwn(next, key))
+                        update([...location, key], previous[key], undefined);
+                }
+                return;
+            }
+            // Replacing an emptying object also removes its trailing comma (modify's last-property
+            // deletion otherwise leaves `{,}`). retainComments keeps comments from the removed subtree.
+        }
+        // Replace shrinking arrays whole: modify's last-element deletion can truncate a compact
+        // value incorrectly. Equal-length/growing arrays still get incremental, comment-safe edits.
+        if (Array.isArray(previous) && Array.isArray(next) && next.length >= previous.length) {
+            for (let index = 0; index < next.length; index++) {
+                update([...location, index], previous[index], next[index]);
+            }
+            return;
+        }
+        const edits = modify(text, location, next, { formattingOptions: { insertSpaces: true, tabSize: 2, eol } });
+        text = applyEdits(text, edits.map((edit) => retainComments(text, edit, eol)));
+    };
+    update([], document.value, value);
+    // Never let a library edit boundary or comment relocation write malformed output.
+    parseJsoncObject(document.file, text);
+    return bom + text;
+}

package/dist/menu.js

@@ -1,9 +1,13 @@
 import pc from "picocolors";
 import prompts from "prompts";
-import { cmdAdd, cmdQuickAdd, cmdApps, cmdInstall, cmdDiscover, cmdImport, cmdList, cmdRemove, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
+import { cmdAdd, cmdQuickAdd, cmdApps, cmdInstall, cmdDiscover, cmdImport, cmdList, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
 import { getLocale, setLocale, t } from "./i18n.js";
 import { loadStore, saveStore } from "./store.js";
 import { appPackages, appCommand, installedVersion } from "./apps.js";
+import { cmdRemoveProvider, cmdRename } from "./provider-actions.js";
+import { listRemovableProviders } from "./remove.js";
+import { providerIdFromBaseUrl } from "./slug.js";
+import { targets } from "./targets/index.js";
 function bye() {
     console.log(pc.dim(`\n${t("menu.bye")}`));
     process.exit(0);
@@ -57,6 +61,80 @@ async function pickProvider(message) {
     const p = store.providers[id];
     return { id, defaultModel: p.defaultModel, models: p.models.map((m) => m.id) };
 }
+async function renameFromMenu() {
+    const picked = await pickProvider(t("menu.renameProvider"));
+    if (!picked)
+        return;
+    const provider = loadStore().providers[picked.id];
+    const { newId } = await prompts({
+        type: "text",
+        name: "newId",
+        message: t("menu.newId"),
+        initial: providerIdFromBaseUrl(provider.baseUrl, provider.protocol),
+        validate: (value) => /^[a-z0-9][a-z0-9_-]*$/.test(value.trim()) || t("add.idInvalid"),
+    }, cancel);
+    if (!newId)
+        return;
+    const next = String(newId).trim();
+    await cmdRename(picked.id, next, { dryRun: true });
+    if (await askToggle(t("menu.renameConfirm", { oldId: picked.id, newId: next }))) {
+        await cmdRename(picked.id, next);
+    }
+}
+async function removeFromMenu() {
+    const { scope } = await prompts({
+        type: "select",
+        name: "scope",
+        message: t("menu.removeScope"),
+        hint: t("menu.selectInstructions"),
+        choices: [
+            { title: t("menu.removeStore"), value: "store" },
+            { title: t("menu.removeEverywhere"), value: "everywhere" },
+            { title: t("menu.removeLocal"), value: "local" },
+        ],
+    }, cancel);
+    if (!scope)
+        return;
+    let app;
+    if (scope === "local") {
+        const answer = await prompts({
+            type: "select",
+            name: "app",
+            message: t("menu.removeApp"),
+            hint: t("menu.selectInstructions"),
+            choices: targets.map((target) => ({ title: `${target.id} · ${target.name}`, value: target.id })),
+        }, cancel);
+        app = answer.app;
+        if (!app)
+            return;
+    }
+    const entries = app
+        ? listRemovableProviders(app)
+        : Object.values(loadStore().providers).map((provider) => ({ id: provider.id, name: provider.name }));
+    if (!entries.length) {
+        console.log(pc.dim(t("menu.noRemovable")));
+        return;
+    }
+    const { selected } = await prompts({
+        type: "select",
+        name: "selected",
+        message: t("menu.removeProvider"),
+        hint: t("menu.selectInstructions"),
+        choices: entries.map((entry, index) => ({
+            title: `${entry.id} · ${entry.app ?? "agentsw"}${entry.name && entry.name !== entry.id ? ` · ${entry.name}` : ""}`,
+            value: index,
+        })),
+    }, cancel);
+    const picked = entries[selected];
+    if (!picked)
+        return;
+    const opts = scope === "local" ? { apps: picked.app } : { prune: scope === "everywhere" };
+    await cmdRemoveProvider(picked.id, { ...opts, dryRun: true });
+    const scopeLabel = picked.app ?? t(scope === "everywhere" ? "menu.removeEverywhere" : "menu.removeStore");
+    if (await askToggle(t("menu.removeConfirmScope", { id: picked.id, scope: scopeLabel }))) {
+        await cmdRemoveProvider(picked.id, opts);
+    }
+}
 export async function cmdMenu() {
     if (!loadStore().language)
         await chooseLanguage();
@@ -82,6 +160,7 @@ export async function cmdMenu() {
                 { title: t("menu.list"), value: "list" },
                 { title: t("menu.sync"), value: "sync" },
                 { title: t("menu.discover"), value: "discover" },
+                { title: t("menu.rename"), value: "rename" },
                 { title: t("menu.remove"), value: "remove" },
                 { title: t("menu.apps"), value: "apps" },
                 { title: t("menu.installApp"), value: "install" },
@@ -142,14 +221,16 @@ export async function cmdMenu() {
             const sync = await askToggle(t("menu.pushRefresh"));
             await cmdDiscover(picked.id, { sync });
         }
-        else if (action === "remove") {
-            const picked = await pickProvider(t("menu.removeProvider"));
-            if (!picked)
-                continue;
-            if (!(await askToggle(t("menu.reallyRemove", { id: pc.bold(picked.id) }))))
-                continue;
-            const prune = await askToggle(t("menu.pruneConfigs"));
-            await cmdRemove(picked.id, { prune });
+        else if (action === "rename" || action === "remove") {
+            try {
+                if (action === "rename")
+                    await renameFromMenu();
+                else
+                    await removeFromMenu();
+            }
+            catch (error) {
+                console.error(pc.red(error instanceof Error ? error.message : String(error)));
+            }
         }
         else if (action === "apps") {
             await cmdApps();

package/dist/provider-actions.js

@@ -0,0 +1,37 @@
+import pc from "picocolors";
+import { t } from "./i18n.js";
+import { renameProvider } from "./rename.js";
+import { listRemovableProviders, removeProvider } from "./remove.js";
+function reportChanges(result, dryRun) {
+    console.log(t(dryRun ? "manage.preview" : "manage.changed", { count: result.files.length }));
+    for (const file of result.files)
+        console.log(`  ${file}`);
+    if (result.backupDir)
+        console.log(pc.dim(t("manage.backup", { path: result.backupDir })));
+}
+export async function cmdRename(id, newId, opts = {}) {
+    const result = await renameProvider(id, newId, opts);
+    if (!opts.dryRun)
+        console.log(pc.green(t("rename.done", { oldId: id, newId })));
+    reportChanges(result, opts.dryRun);
+}
+export async function cmdRemoveProvider(id, opts = {}) {
+    const result = await removeProvider(id, opts);
+    if (!opts.dryRun) {
+        console.log(pc.green(opts.apps
+            ? t("remove.localDone", { id, apps: opts.apps })
+            : t("remove.removed", { id })));
+        if (!opts.apps && !opts.prune)
+            console.log(pc.dim(t("remove.note")));
+    }
+    reportChanges(result, opts.dryRun);
+}
+export function cmdListLocalProviders(apps) {
+    const rows = listRemovableProviders(apps);
+    if (!rows.length) {
+        console.log(t("list.localNone"));
+        return;
+    }
+    for (const row of rows)
+        console.log(`${row.app.padEnd(12)} ${row.id}${row.name && row.name !== row.id ? ` · ${row.name}` : ""}`);
+}