codiedev 0.10.0-beta.1 → 0.10.0-beta.11

package/dist/connect.js

@@ -39,36 +39,29 @@ const https = __importStar(require("https"));
 const http = __importStar(require("http"));
 const crypto = __importStar(require("crypto"));
 const os = __importStar(require("os"));
-const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
+const cliSession_1 = require("./cliSession");
 const connectFlow_1 = require("./connectFlow");
 const version_1 = require("./version");
 const upgradeNudge_1 = require("./upgradeNudge");
 const shared_1 = require("./commands/shared");
-const securityInstall_1 = require("./securityInstall");
-const securityPolicy_1 = require("./securityPolicy");
-const securityFeature_1 = require("./securityFeature");
-// cli.codiedev.com is a Convex custom domain on the prod deployment; the
-// underlying judicious-falcon-861.convex.site URL keeps serving, so configs
-// written by older CLI versions stay valid without a re-connect.
+const harnessDirs_1 = require("./harnessDirs");
 const BACKEND_URL = process.env.CODIEDEV_URL || "https://cli.codiedev.com";
-/**
- * Reads a line from stdin without echoing the typed/pasted characters —
- * for tokens, passwords, anything that shouldn't end up in terminal
- * scrollback or screenshots. Echoes `*` per character so the user gets
- * visual feedback that input is being received.
- *
- * Falls back to the regular `prompt()` if stdin isn't a TTY (e.g., piped
- * input in CI). Without a TTY there's no echo to suppress anyway, and
- * raw mode would error.
- */
+function prompt(question) {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(question, (answer) => {
+            rl.close();
+            resolve(answer);
+        });
+    });
+}
 function promptHidden(question) {
     return new Promise((resolve) => {
         const stdin = process.stdin;
         const stdout = process.stdout;
         if (!stdin.isTTY) {
-            // CI / piped input — no terminal to mute. Fall back to readline.
             const rl = readline.createInterface({ input: stdin, output: stdout });
             rl.question(question, (answer) => {
                 rl.close();
@@ -85,23 +78,18 @@ function promptHidden(question) {
         };
         const onData = (chunk) => {
             const key = chunk.toString("utf8");
-            // Iterate so a single `chunk` containing a multi-char paste still
-            // masks each character individually.
             for (const ch of key) {
-                // Ctrl+C — abort like a normal terminal interrupt.
                 if (ch === "") {
                     cleanup();
                     stdout.write("\n");
                     process.exit(130);
                 }
-                // Enter — finalize.
                 if (ch === "\r" || ch === "\n") {
                     cleanup();
                     stdout.write("\n");
                     resolve(buf.trim());
                     return;
                 }
-                // Backspace / DEL — erase one masked char.
                 if (ch === "" || ch === "\b") {
                     if (buf.length > 0) {
                         buf = buf.slice(0, -1);
@@ -109,7 +97,6 @@ function promptHidden(question) {
                     }
                     continue;
                 }
-                // Ignore other control bytes (escape sequences from arrow keys, etc.)
                 if (ch.charCodeAt(0) < 0x20)
                     continue;
                 buf += ch;
@@ -165,26 +152,42 @@ function postJson(url, body, extraHeaders = {}) {
     });
 }
 async function runConnect(args = []) {
-    // `--force` (or `-f`) re-prompts for a token even if `~/.codiedev/config.json`
-    // already has one. Default behavior reuses the saved token so users can
-    // re-run `connect` (e.g., after installing Claude Code) without having to
-    // mint a fresh token from the portal — which is what bit Sonifi's first
-    // engineer when he interpreted "no visible token" as "the old one is gone".
     const force = args.includes("--force") || args.includes("-f");
+    const pasteToken = args.includes("--token");
+    const useDevice = args.includes("--no-browser") || (!args.includes("--browser") && (0, cliSession_1.isHeadless)());
     console.log("\nWelcome to Codiedev CLI\n");
     await (0, upgradeNudge_1.maybePrintUpgradeNudge)();
     console.log("This will connect your coding agent to your Codiedev workspace and install");
     console.log("the session capture hook for org-wide session sharing.\n");
+    await (0, cliSession_1.ensureFreshToken)({ configPath: utils_1.CONFIG_PATH }).catch(() => undefined);
     const saved = (0, utils_1.readConfig)();
-    const decision = (0, connectFlow_1.resolveConnectToken)({ savedConfig: saved, force });
+    const decision = (0, connectFlow_1.resolveConnectToken)({ savedConfig: saved, force: force || pasteToken });
     let token;
+    let auth;
     if (decision.source === "reused") {
         token = decision.token;
-        console.log(`Reusing API token from ~/.codiedev/config.json (run with --force to use a new one).\n`);
+        auth = saved?.auth;
+        console.log(auth
+            ? `Reusing your browser sign-in from ~/.codiedev/config.json (run with --force to sign in again).\n`
+            : `Reusing API token from ~/.codiedev/config.json (run with --force to sign in again).\n`);
+    }
+    else if (!pasteToken) {
+        if (saved?.auth)
+            await (0, cliSession_1.logout)({ configPath: utils_1.CONFIG_PATH }).catch(() => undefined);
+        const result = await (0, connectFlow_1.signInWithTokenFallback)({
+            signIn: () => useDevice ? (0, cliSession_1.deviceLogin)({ backendUrl: BACKEND_URL }) : (0, cliSession_1.browserLogin)({ backendUrl: BACKEND_URL }),
+            interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
+            askYesNo: async (q) => /^y(es)?$/i.test((await prompt(q)).trim()),
+            askToken: promptHidden,
+            log: (line) => console.log(line),
+            error: (line) => console.error(line),
+        });
+        if (!result)
+            process.exit(1);
+        token = result.token;
+        auth = result.auth;
     }
     else {
-        // Hidden prompt — masks the token with `*` as it's typed/pasted so it
-        // doesn't end up in terminal scrollback or screenshots.
         token = await promptHidden("Enter your Codiedev API token: ");
         if (!token) {
             console.error("Error: API token is required.");
@@ -202,10 +205,8 @@ async function runConnect(args = []) {
         console.error(`\nError: Failed to validate token — ${err.message}`);
         process.exit(1);
     }
-    // Extract fields from response
     const companyId = responseData.companyId;
     const companyName = responseData.companyName;
-    const agentSecurityEnabled = responseData.agentSecurityEnabled === true;
     const repos = responseData.repos ?? [];
     if (!companyId || !companyName) {
         console.error("\nError: Invalid response from server. Token may be invalid.");
@@ -218,10 +219,10 @@ async function runConnect(args = []) {
         repos,
         lastSynced: new Date().toISOString(),
         backendUrl: BACKEND_URL,
-        agentSecurityEnabled,
         deviceId: saved?.deviceId || crypto.randomUUID(),
         deviceName: saved?.deviceName || os.hostname(),
         captureIgnoredPaths: saved?.captureIgnoredPaths ?? [],
+        ...(auth ? { auth } : {}),
     };
     try {
         (0, utils_1.writeConfig)(config);
@@ -230,15 +231,7 @@ async function runConnect(args = []) {
         console.error(`\nError: Failed to save config — ${err.message}`);
         process.exit(1);
     }
-    // Once we have a valid token + config, every subsequent step posts a
-    // per-step row to /api/telemetry/install-event so the admin page can show
-    // a timeline when a customer says "it connected but it doesn't work."
-    // Fire-and-forget — never blocks the connect flow.
     (0, shared_1.recordInstallEvent)(config, { step: "started", ok: true });
-    // One-way device status sync. Local config remains authoritative: a network
-    // failure here never removes or weakens an ignored path. This also registers
-    // a freshly connected device with an empty list so the portal can distinguish
-    // "connected, no exclusions" from "old CLI has never reported status".
     try {
         await postJson(`${BACKEND_URL}/api/cli/capture-exclusions`, {
             deviceId: config.deviceId,
@@ -249,17 +242,6 @@ async function runConnect(args = []) {
     catch (err) {
         console.warn(`Warning: Local capture settings are active, but portal status did not sync — ${err.message}`);
     }
-    // Migration: strip MCP server entries written by pre-CLI-only versions
-    // of `codiedev connect`. These pointed at `npx codiedev-mcp`, a binary
-    // that was removed in 0.3.4 and that 0.7.11+ no longer ships. Without
-    // cleanup, customers upgrading from any prior version see persistent
-    // "MCP server failed to start" errors in their agent UIs even though
-    // the CLI works fine. Each helper is idempotent and a no-op when the
-    // relevant config file doesn't exist.
-    //
-    // Each call is wrapped because the user's upgrade path matters more
-    // than the cleanup. A locked / wrong-owner config file (rare but real)
-    // shouldn't block the install loop or strand them on an old version.
     for (const [label, fn] of [
         ["Claude Code", utils_1.cleanupClaudeCodeMcp],
         ["Codex", utils_1.cleanupCodexMcp],
@@ -278,29 +260,16 @@ async function runConnect(args = []) {
     const hasCodex = (0, utils_1.codexInstalled)();
     const hasCursor = (0, utils_1.cursorInstalled)();
     const hasOpenCode = (0, utils_1.openCodeInstalled)();
+    const hasCopilot = (0, utils_1.copilotInstalled)();
+    const hasPi = (0, utils_1.piInstalled)();
     (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "claude-code", ok: hasClaude });
     (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "codex", ok: hasCodex });
     (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "cursor", ok: hasCursor });
     (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "opencode", ok: hasOpenCode });
+    (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "copilot", ok: hasCopilot });
+    (0, shared_1.recordInstallEvent)(config, { step: "detect", target: "pi", ok: hasPi });
     const installed = [];
-    // Machine-readable target keys reported back to the backend via
-    // /api/cli/markInstalled so the portal's "Connected" state reflects
-    // what's actually wired up on this machine, not just "token validated."
     const installedTargets = [];
-    const home = os.homedir();
-    const securityConfigPaths = [
-        path.join(home, ".claude", "settings.json"),
-        path.join(home, ".codex", "hooks.json"),
-        path.join(home, ".cursor", "hooks.json"),
-        path.join(home, ".config", "opencode", "plugins", "codiedev.js"),
-        path.join(home, ".codex", "config.toml"),
-    ];
-    // Snapshot before any hook update. Rollback is intentionally not automatic:
-    // an administrator can inspect these 0600 copies before restoring them.
-    const securitySnapshot = (0, securityInstall_1.createSecurityInstallSnapshot)(securityConfigPaths);
-    // Wrap each per-target write so we emit one install_target row each. The
-    // existing user-visible behavior (console.warn on failure, continue) is
-    // unchanged — telemetry just observes the outcome.
     const runInstall = (target, fn, label, targetKey) => {
         try {
             fn();
@@ -320,56 +289,26 @@ async function runConnect(args = []) {
         }
     };
     if (hasClaude) {
-        runInstall("claude-code-hook", () => (0, utils_1.installHook)(agentSecurityEnabled), "Claude Code SessionEnd (capture) + UserPromptSubmit (skill discovery) + Stop (auto-backup) hooks (~/.claude/settings.json)", "claudeCode-hook");
-        runInstall("claude-code-instructions", utils_1.installClaudeCodeInstructions, "Claude Code agent instructions (~/.claude/CLAUDE.md)", "claudeCode-instructions");
+        runInstall("claude-code-hook", utils_1.installHook, `Claude Code SessionEnd (capture) + UserPromptSubmit (skill discovery) + Stop (auto-backup) hooks (${(0, harnessDirs_1.displayPath)(path.join((0, harnessDirs_1.claudeConfigDir)(), "settings.json"))})`, "claudeCode-hook");
+        runInstall("claude-code-instructions", utils_1.installClaudeCodeInstructions, `Claude Code agent instructions (${(0, harnessDirs_1.displayPath)(path.join((0, harnessDirs_1.claudeConfigDir)(), "CLAUDE.md"))})`, "claudeCode-instructions");
     }
     if (hasCodex) {
-        runInstall("codex-hook", () => (0, utils_1.installCodexHook)(agentSecurityEnabled), "Codex Stop (capture + auto-backup) hooks (~/.codex/hooks.json)", "codex-hook");
-        runInstall("codex-instructions", utils_1.installCodexInstructions, "Codex agent instructions (~/.codex/AGENTS.md)", "codex-instructions");
+        runInstall("codex-hook", utils_1.installCodexHook, `Codex Stop (capture + auto-backup) hooks (${(0, harnessDirs_1.displayPath)(path.join((0, harnessDirs_1.codexHome)(), "hooks.json"))})`, "codex-hook");
+        runInstall("codex-instructions", utils_1.installCodexInstructions, `Codex agent instructions (${(0, harnessDirs_1.displayPath)(path.join((0, harnessDirs_1.codexHome)(), "AGENTS.md"))})`, "codex-instructions");
     }
     if (hasCursor) {
-        runInstall("cursor-hook", () => (0, utils_1.installCursorHook)(agentSecurityEnabled), "Cursor sessionStart + prompt security + stop backup + sessionEnd capture hooks (~/.cursor/hooks.json)", "cursor-hook");
+        runInstall("cursor-hook", utils_1.installCursorHook, "Cursor sessionStart + stop backup + sessionEnd capture hooks (~/.cursor/hooks.json)", "cursor-hook");
         runInstall("cursor-instructions", utils_1.installCursorInstructions, "Cursor agent instructions (~/.cursor/rules/codiedev.mdc)", "cursor-instructions");
     }
-    // Always stage the adapter. It is dormant until OpenCode starts, which lets
-    // a user connect Claude Code today and install the Codie harness tomorrow
-    // without needing a second setup ritual.
-    runInstall("opencode-capture-adapter", () => (0, utils_1.installOpenCodeCapturePlugin)(agentSecurityEnabled), "OpenCode session capture adapter (~/.config/opencode/plugins/codiedev.js)", "opencode-capture");
-    // Record the exact installed hook bytes and the pre-update rollback files.
-    // This supplies health/integrity checks without requiring a package publish
-    // or trusting whichever `node` happens to be first on PATH later.
-    try {
-        const hookScriptPath = path.join(__dirname, "hook.js");
-        if (agentSecurityEnabled && fs.existsSync(hookScriptPath)) {
-            const targets = [];
-            if (installedTargets.includes("claudeCode-hook"))
-                targets.push({ surface: "claude-code", configPath: securityConfigPaths[0] });
-            if (installedTargets.includes("codex-hook"))
-                targets.push({ surface: "codex", configPath: securityConfigPaths[1] });
-            if (installedTargets.includes("cursor-hook"))
-                targets.push({ surface: "cursor", configPath: securityConfigPaths[2] });
-            if (installedTargets.includes("opencode-capture"))
-                targets.push({ surface: "codie-harness", configPath: securityConfigPaths[3] });
-            (0, securityInstall_1.writeSecurityInstallManifest)({ hookScriptPath, snapshot: securitySnapshot, targets });
-        }
-    }
-    catch (err) {
-        console.warn(`Warning: Security hooks installed, but integrity manifest could not be written — ${err.message}`);
+    if (hasCopilot) {
+        runInstall("copilot-hook", utils_1.installCopilotHook, `GitHub Copilot (VS Code + CLI) sessionStart + agentStop backup + sessionEnd capture hooks (${(0, utils_1.copilotHooksPath)()})`, "copilot-hook");
+        runInstall("copilot-instructions", utils_1.installCopilotInstructions, "GitHub Copilot CLI team artifact instructions", "copilot-instructions");
     }
-    // Prime the local cache after installation. Hooks read this file only, so
-    // an endpoint decision never depends on live network latency.
-    if (agentSecurityEnabled) {
-        try {
-            await (0, securityPolicy_1.syncEndpointSecurityPolicy)(config);
-        }
-        catch (err) {
-            console.warn(`Warning: Agent-security policy will use safe defaults until sync succeeds — ${err.message}`);
-        }
+    runInstall("pi-extension", utils_1.installPiExtension, `pi session start + skill discovery + capture extension (${(0, harnessDirs_1.displayPath)((0, utils_1.piExtensionPath)())})`, "pi-extension");
+    if (hasPi) {
+        runInstall("pi-instructions", utils_1.installPiInstructions, `pi agent instructions (${(0, harnessDirs_1.displayPath)((0, utils_1.piInstructionsPath)())})`, "pi-instructions");
     }
-    // Tell the backend which targets we wired up so the portal's onboarding
-    // card flips to "Connected" only when something actually installed —
-    // not on bare token validation. Best-effort: a network failure here
-    // doesn't undo the local install, and `codiedev doctor` still works.
+    runInstall("opencode-capture-adapter", utils_1.installOpenCodeCapturePlugin, `OpenCode session capture adapter (${(0, harnessDirs_1.displayPath)(path.join((0, harnessDirs_1.openCodeConfigDir)(), "plugins", "codiedev.js"))})`, "opencode-capture");
     if (installedTargets.length > 0) {
         try {
             await postJson(`${BACKEND_URL}/api/cli/markInstalled`, {
@@ -388,7 +327,7 @@ async function runConnect(args = []) {
             });
         }
     }
-    if (!hasClaude && !hasCodex && !hasCursor && !hasOpenCode) {
+    if (!hasClaude && !hasCodex && !hasCursor && !hasOpenCode && !hasCopilot && !hasPi) {
         console.warn("\nNo existing AI client detected; the Codie/OpenCode adapter is ready for a later install.");
         console.warn("If you just installed Claude Code, launch it once (so ~/.claude is created),");
         console.warn("then re-run `npx codiedev connect` to wire up the capture hook.");
@@ -404,8 +343,6 @@ async function runConnect(args = []) {
     }
     console.log();
     console.log("Run `codiedev doctor` to verify everything's wired up.");
-    if ((0, securityFeature_1.isAgentSecurityEnabled)(config)) {
-        console.log("Run `codiedev security pilot` to validate blocking safely.");
-    }
+    console.log("If `codiedev` is not on PATH, run `npx codiedev@latest doctor` instead.");
     console.log();
 }

package/dist/connectFlow.js

@@ -1,15 +1,7 @@
 "use strict";
-// Pure helper for `npx codiedev connect` — decides where the API token
-// comes from. Splitting this out lets us TDD the policy (re-use vs. re-prompt)
-// without touching readline or fs at all.
-//
-// Motivation: Jackson hit a confusing flow where he had a working token in
-// `~/.codiedev/config.json`, re-ran `connect` (to pick up Claude Code that
-// he'd just installed), and was forced to paste a token again. Since the
-// portal only displays the plaintext on creation, his only option was to
-// generate a new one — leaving him thinking the old one had been lost.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveConnectToken = resolveConnectToken;
+exports.signInWithTokenFallback = signInWithTokenFallback;
 function resolveConnectToken(input) {
     if (input.force)
         return { source: "prompt-required" };
@@ -19,3 +11,37 @@ function resolveConnectToken(input) {
         return { source: "prompt-required" };
     return { source: "reused", token: input.savedConfig.token };
 }
+async function signInWithTokenFallback(deps) {
+    deps.log("Prefer an API token? Press Ctrl+C and run `codiedev connect --token`.\n");
+    try {
+        const s = await deps.signIn();
+        deps.log("Signed in. No API key is stored on this machine.\n");
+        return {
+            token: s.accessToken,
+            auth: {
+                kind: "browser",
+                clientId: s.clientId,
+                refreshToken: s.refreshToken,
+                accessTokenExpiresAt: s.expiresAt,
+            },
+        };
+    }
+    catch (err) {
+        deps.error(`\nBrowser sign-in didn't finish: ${err.message}`);
+        if (!deps.interactive) {
+            deps.error("To paste an API token instead, run `codiedev connect --token`.");
+            return null;
+        }
+        if (!(await deps.askYesNo("Paste an API token instead? [y/N] "))) {
+            deps.error("Run `codiedev connect` to try again, or `codiedev connect --token` to paste a token.");
+            return null;
+        }
+        deps.log("Create one at https://codiedev.com/portal/integrations/claude-code\n");
+        const token = (await deps.askToken("Enter your Codiedev API token: ")).trim();
+        if (!token) {
+            deps.error("Error: API token is required.");
+            return null;
+        }
+        return { token };
+    }
+}