@vandeepunk/pi-coding-agent 0.0.3 → 0.0.4

package/dist/main.js

@@ -4,8 +4,6 @@
  * This file handles CLI argument parsing and translates them into
  * createAgentSession() options. The SDK does the heavy lifting.
  */
-import { homedir } from "node:os";
-import { isAbsolute, join, relative, resolve } from "node:path";
 import { modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
 import chalk from "chalk";
 import { createInterface } from "readline";
@@ -14,7 +12,7 @@ import { selectConfig } from "./cli/config-selector.js";
 import { processFileArguments } from "./cli/file-processor.js";
 import { listModels } from "./cli/list-models.js";
 import { selectSession } from "./cli/session-picker.js";
-import { CONFIG_DIR_NAME, getAgentDir, getModelsPath, VERSION } from "./config.js";
+import { APP_NAME, getAgentDir, getModelsPath, VERSION } from "./config.js";
 import { AuthStorage } from "./core/auth-storage.js";
 import { DEFAULT_THINKING_LEVEL } from "./core/defaults.js";
 import { exportFromFile } from "./core/export-html/index.js";
@@ -52,205 +50,201 @@ async function readPipedStdin() {
         process.stdin.resume();
     });
 }
+function getPackageCommandUsage(command) {
+    switch (command) {
+        case "install":
+            return `${APP_NAME} install <source> [-l]`;
+        case "remove":
+            return `${APP_NAME} remove <source> [-l]`;
+        case "update":
+            return `${APP_NAME} update [source]`;
+        case "list":
+            return `${APP_NAME} list`;
+    }
+}
+function printPackageCommandHelp(command) {
+    switch (command) {
+        case "install":
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("install")}
+
+Install a package and add it to settings.
+
+Options:
+  -l, --local    Install project-locally (.pi/settings.json)
+
+Examples:
+  ${APP_NAME} install npm:@foo/bar
+  ${APP_NAME} install git:github.com/user/repo
+  ${APP_NAME} install https://github.com/user/repo
+  ${APP_NAME} install git@github.com:user/repo
+  ${APP_NAME} install ./local/path
+`);
+            return;
+        case "remove":
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("remove")}
+
+Remove a package and its source from settings.
+
+Options:
+  -l, --local    Remove from project settings (.pi/settings.json)
+
+Example:
+  ${APP_NAME} remove npm:@foo/bar
+`);
+            return;
+        case "update":
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("update")}
+
+Update installed packages.
+If <source> is provided, only that package is updated.
+`);
+            return;
+        case "list":
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("list")}
+
+List installed packages from user and project settings.
+`);
+            return;
+    }
+}
 function parsePackageCommand(args) {
     const [command, ...rest] = args;
     if (command !== "install" && command !== "remove" && command !== "update" && command !== "list") {
         return undefined;
     }
     let local = false;
-    const sources = [];
+    let help = false;
+    let invalidOption;
+    let source;
     for (const arg of rest) {
+        if (arg === "-h" || arg === "--help") {
+            help = true;
+            continue;
+        }
         if (arg === "-l" || arg === "--local") {
-            local = true;
+            if (command === "install" || command === "remove") {
+                local = true;
+            }
+            else {
+                invalidOption = invalidOption ?? arg;
+            }
             continue;
         }
-        sources.push(arg);
-    }
-    return { command, source: sources[0], local };
-}
-function expandTildePath(input) {
-    const trimmed = input.trim();
-    if (trimmed === "~")
-        return homedir();
-    if (trimmed.startsWith("~/"))
-        return resolve(homedir(), trimmed.slice(2));
-    if (trimmed.startsWith("~"))
-        return resolve(homedir(), trimmed.slice(1));
-    return trimmed;
-}
-function resolveLocalSourceFromInput(source, cwd) {
-    const expanded = expandTildePath(source);
-    return isAbsolute(expanded) ? resolve(expanded) : resolve(cwd, expanded);
-}
-function resolveLocalSourceFromSettings(source, baseDir) {
-    const expanded = expandTildePath(source);
-    return isAbsolute(expanded) ? expanded : resolve(baseDir, expanded);
-}
-function normalizeLocalSourceForSettings(source, baseDir, cwd) {
-    const resolved = resolveLocalSourceFromInput(source, cwd);
-    const rel = relative(baseDir, resolved);
-    return rel || ".";
-}
-function normalizePackageSourceForSettings(source, baseDir, cwd) {
-    const normalized = normalizeExtensionSource(source);
-    if (normalized.type !== "local") {
-        return source;
-    }
-    return normalizeLocalSourceForSettings(source, baseDir, cwd);
-}
-function normalizeExtensionSource(source) {
-    if (source.startsWith("npm:")) {
-        const spec = source.slice("npm:".length).trim();
-        const match = spec.match(/^(@?[^@]+(?:\/[^@]+)?)(?:@.+)?$/);
-        return { type: "npm", key: match?.[1] ?? spec };
-    }
-    if (source.startsWith("git:")) {
-        const repo = source.slice("git:".length).trim().split("@")[0] ?? "";
-        return { type: "git", key: repo.replace(/^https?:\/\//, "").replace(/\.git$/, "") };
-    }
-    // Raw git URLs
-    if (source.startsWith("https://") || source.startsWith("http://")) {
-        const repo = source.split("@")[0] ?? "";
-        return { type: "git", key: repo.replace(/^https?:\/\//, "").replace(/\.git$/, "") };
-    }
-    return { type: "local", key: source };
-}
-function normalizeSourceForInput(source, cwd) {
-    const normalized = normalizeExtensionSource(source);
-    if (normalized.type !== "local") {
-        return normalized;
-    }
-    return { type: "local", key: resolveLocalSourceFromInput(source, cwd) };
-}
-function normalizeSourceForSettings(source, baseDir) {
-    const normalized = normalizeExtensionSource(source);
-    if (normalized.type !== "local") {
-        return normalized;
-    }
-    return { type: "local", key: resolveLocalSourceFromSettings(source, baseDir) };
-}
-function sourcesMatch(a, b, baseDir, cwd) {
-    const left = normalizeSourceForSettings(a, baseDir);
-    const right = normalizeSourceForInput(b, cwd);
-    return left.type === right.type && left.key === right.key;
-}
-function getPackageSourceString(pkg) {
-    return typeof pkg === "string" ? pkg : pkg.source;
-}
-function packageSourcesMatch(a, b, baseDir, cwd) {
-    const aSource = getPackageSourceString(a);
-    return sourcesMatch(aSource, b, baseDir, cwd);
-}
-function updatePackageSources(settingsManager, source, local, cwd, agentDir, action) {
-    const currentSettings = local ? settingsManager.getProjectSettings() : settingsManager.getGlobalSettings();
-    const currentPackages = currentSettings.packages ?? [];
-    const baseDir = local ? join(cwd, CONFIG_DIR_NAME) : agentDir;
-    const normalizedSource = normalizePackageSourceForSettings(source, baseDir, cwd);
-    let nextPackages;
-    let changed = false;
-    if (action === "add") {
-        const exists = currentPackages.some((existing) => packageSourcesMatch(existing, source, baseDir, cwd));
-        nextPackages = exists ? currentPackages : [...currentPackages, normalizedSource];
-        changed = !exists;
-    }
-    else {
-        nextPackages = currentPackages.filter((existing) => !packageSourcesMatch(existing, source, baseDir, cwd));
-        changed = nextPackages.length !== currentPackages.length;
-    }
-    if (local) {
-        settingsManager.setProjectPackages(nextPackages);
-    }
-    else {
-        settingsManager.setPackages(nextPackages);
+        if (arg.startsWith("-")) {
+            invalidOption = invalidOption ?? arg;
+            continue;
+        }
+        if (!source) {
+            source = arg;
+        }
     }
-    return changed;
+    return { command, source, local, help, invalidOption };
 }
 async function handlePackageCommand(args) {
     const options = parsePackageCommand(args);
     if (!options) {
         return false;
     }
+    if (options.help) {
+        printPackageCommandHelp(options.command);
+        return true;
+    }
+    if (options.invalidOption) {
+        console.error(chalk.red(`Unknown option ${options.invalidOption} for "${options.command}".`));
+        console.error(chalk.dim(`Use "${APP_NAME} --help" or "${getPackageCommandUsage(options.command)}".`));
+        process.exitCode = 1;
+        return true;
+    }
+    const source = options.source;
+    if ((options.command === "install" || options.command === "remove") && !source) {
+        console.error(chalk.red(`Missing ${options.command} source.`));
+        console.error(chalk.dim(`Usage: ${getPackageCommandUsage(options.command)}`));
+        process.exitCode = 1;
+        return true;
+    }
     const cwd = process.cwd();
     const agentDir = getAgentDir();
     const settingsManager = SettingsManager.create(cwd, agentDir);
     const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
-    // Set up progress callback for CLI feedback
     packageManager.setProgressCallback((event) => {
         if (event.type === "start") {
             process.stdout.write(chalk.dim(`${event.message}\n`));
         }
-        else if (event.type === "error") {
-            console.error(chalk.red(`Error: ${event.message}`));
-        }
     });
-    if (options.command === "install") {
-        if (!options.source) {
-            console.error(chalk.red("Missing install source."));
-            process.exit(1);
-        }
-        await packageManager.install(options.source, { local: options.local });
-        updatePackageSources(settingsManager, options.source, options.local, cwd, agentDir, "add");
-        console.log(chalk.green(`Installed ${options.source}`));
-        return true;
-    }
-    if (options.command === "remove") {
-        if (!options.source) {
-            console.error(chalk.red("Missing remove source."));
-            process.exit(1);
-        }
-        await packageManager.remove(options.source, { local: options.local });
-        const removed = updatePackageSources(settingsManager, options.source, options.local, cwd, agentDir, "remove");
-        if (!removed) {
-            console.error(chalk.red(`No matching package found for ${options.source}`));
-            process.exit(1);
-        }
-        console.log(chalk.green(`Removed ${options.source}`));
-        return true;
-    }
-    if (options.command === "list") {
-        const globalSettings = settingsManager.getGlobalSettings();
-        const projectSettings = settingsManager.getProjectSettings();
-        const globalPackages = globalSettings.packages ?? [];
-        const projectPackages = projectSettings.packages ?? [];
-        if (globalPackages.length === 0 && projectPackages.length === 0) {
-            console.log(chalk.dim("No packages installed."));
-            return true;
-        }
-        const formatPackage = (pkg, scope) => {
-            const source = typeof pkg === "string" ? pkg : pkg.source;
-            const filtered = typeof pkg === "object";
-            const display = filtered ? `${source} (filtered)` : source;
-            console.log(`  ${display}`);
-            // Show resolved path
-            const path = packageManager.getInstalledPath(source, scope);
-            if (path) {
-                console.log(chalk.dim(`    ${path}`));
-            }
-        };
-        if (globalPackages.length > 0) {
-            console.log(chalk.bold("User packages:"));
-            for (const pkg of globalPackages) {
-                formatPackage(pkg, "user");
+    try {
+        switch (options.command) {
+            case "install":
+                await packageManager.install(source, { local: options.local });
+                packageManager.addSourceToSettings(source, { local: options.local });
+                console.log(chalk.green(`Installed ${source}`));
+                return true;
+            case "remove": {
+                await packageManager.remove(source, { local: options.local });
+                const removed = packageManager.removeSourceFromSettings(source, { local: options.local });
+                if (!removed) {
+                    console.error(chalk.red(`No matching package found for ${source}`));
+                    process.exitCode = 1;
+                    return true;
+                }
+                console.log(chalk.green(`Removed ${source}`));
+                return true;
             }
-        }
-        if (projectPackages.length > 0) {
-            if (globalPackages.length > 0)
-                console.log();
-            console.log(chalk.bold("Project packages:"));
-            for (const pkg of projectPackages) {
-                formatPackage(pkg, "project");
+            case "list": {
+                const globalSettings = settingsManager.getGlobalSettings();
+                const projectSettings = settingsManager.getProjectSettings();
+                const globalPackages = globalSettings.packages ?? [];
+                const projectPackages = projectSettings.packages ?? [];
+                if (globalPackages.length === 0 && projectPackages.length === 0) {
+                    console.log(chalk.dim("No packages installed."));
+                    return true;
+                }
+                const formatPackage = (pkg, scope) => {
+                    const source = typeof pkg === "string" ? pkg : pkg.source;
+                    const filtered = typeof pkg === "object";
+                    const display = filtered ? `${source} (filtered)` : source;
+                    console.log(`  ${display}`);
+                    const path = packageManager.getInstalledPath(source, scope);
+                    if (path) {
+                        console.log(chalk.dim(`    ${path}`));
+                    }
+                };
+                if (globalPackages.length > 0) {
+                    console.log(chalk.bold("User packages:"));
+                    for (const pkg of globalPackages) {
+                        formatPackage(pkg, "user");
+                    }
+                }
+                if (projectPackages.length > 0) {
+                    if (globalPackages.length > 0)
+                        console.log();
+                    console.log(chalk.bold("Project packages:"));
+                    for (const pkg of projectPackages) {
+                        formatPackage(pkg, "project");
+                    }
+                }
+                return true;
             }
+            case "update":
+                await packageManager.update(source);
+                if (source) {
+                    console.log(chalk.green(`Updated ${source}`));
+                }
+                else {
+                    console.log(chalk.green("Updated packages"));
+                }
+                return true;
         }
-        return true;
     }
-    await packageManager.update(options.source);
-    if (options.source) {
-        console.log(chalk.green(`Updated ${options.source}`));
-    }
-    else {
-        console.log(chalk.green("Updated packages"));
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Unknown package command error";
+        console.error(chalk.red(`Error: ${message}`));
+        process.exitCode = 1;
+        return true;
     }
-    return true;
 }
 async function prepareInitialMessage(parsed, autoResizeImages) {
     if (parsed.fileArgs.length === 0) {
@@ -484,16 +478,16 @@ export async function main(args) {
     }
     if (parsed.version) {
         console.log(VERSION);
-        return;
+        process.exit(0);
     }
     if (parsed.help) {
         printHelp();
-        return;
+        process.exit(0);
     }
     if (parsed.listModels !== undefined) {
         const searchPattern = typeof parsed.listModels === "string" ? parsed.listModels : undefined;
         await listModels(modelRegistry, searchPattern);
-        return;
+        process.exit(0);
     }
     // Read piped stdin content (if any) - skip for RPC mode which uses stdin for JSON-RPC
     if (parsed.mode !== "rpc") {
@@ -506,17 +500,18 @@ export async function main(args) {
         }
     }
     if (parsed.export) {
+        let result;
         try {
             const outputPath = parsed.messages.length > 0 ? parsed.messages[0] : undefined;
-            const result = await exportFromFile(parsed.export, outputPath);
-            console.log(`Exported to: ${result}`);
-            return;
+            result = await exportFromFile(parsed.export, outputPath);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : "Failed to export session";
             console.error(chalk.red(`Error: ${message}`));
             process.exit(1);
         }
+        console.log(`Exported to: ${result}`);
+        process.exit(0);
     }
     if (parsed.mode === "rpc" && parsed.fileArgs.length > 0) {
         console.error(chalk.red("Error: @file arguments are not supported in RPC mode"));