@korso/shepherd-ui 0.6.0 → 0.8.0

package/dist/config/ConnectAgent.js

@@ -7,18 +7,63 @@ const TOOLS = [
     { id: "claude", label: "Claude Code" },
     { id: "codex", label: "Codex" },
     { id: "pi", label: "Pi" },
+    { id: "cursor", label: "Cursor" },
     { id: "generic", label: "Generic (JSON)" },
 ];
 // The token placeholder shown before a real token is minted. Switching tools or
 // reading the command pre-mint shows this, never a real secret.
 const TOKEN_PLACEHOLDER = "shp_<paste-after-generating>";
-// The CLI tools differ only in the `mcp add` invocation; the rest of the
-// command (the env flags and the npx tail) is shared.
+// Tools with an `mcp add` CLI. Pi, Cursor, and generic get a JSON config
+// block instead: Pi reads `~/.pi/agent/mcp.json` (or `.pi/mcp.json`), Cursor
+// reads `~/.cursor/mcp.json` (or `.cursor/mcp.json`) — same `mcpServers` shape.
 const CLI_PREFIX = {
     claude: "claude mcp add shepherd -s user",
     codex: "codex mcp add shepherd",
-    pi: "pi mcp add shepherd",
 };
+// `claude mcp add` takes `-e KEY=val`; `codex mcp add` only accepts `--env`.
+const ENV_FLAG = {
+    claude: "-e",
+    codex: "--env",
+};
+// The shepherd-inbox-hook bin: delivers teammate announcements out-of-band AND
+// nudges the agent to run `link` before its first write in an unlinked repo.
+// Neither `claude mcp add` nor `codex mcp add` can install hooks, so the
+// snippet is a paste-into-config block surfaced next to the install command.
+// Cursor has no hook mechanism; Pi uses the bundled extension (see the
+// @korso/shepherd README) — neither gets a snippet here.
+const HOOK_COMMAND = "npx -y --package=@korso/shepherd shepherd-inbox-hook";
+function hookSnippet(tool) {
+    if (tool === "claude") {
+        // SessionStart front-loads the link ask; PreToolUse delivers announcements
+        // and re-nudges right before a write in a still-unlinked repo.
+        return {
+            target: "~/.claude/settings.json",
+            snippet: JSON.stringify({
+                hooks: {
+                    SessionStart: [{ hooks: [{ type: "command", command: HOOK_COMMAND }] }],
+                    PreToolUse: [
+                        { matcher: "*", hooks: [{ type: "command", command: HOOK_COMMAND }] },
+                    ],
+                },
+            }, null, 2),
+        };
+    }
+    if (tool === "codex") {
+        // Codex's PreToolUse only fires for Bash, so UserPromptSubmit is the
+        // frequent event there; hooks must be feature-flagged on.
+        return {
+            target: "~/.codex/config.toml",
+            snippet: [
+                "[features]",
+                "hooks = true",
+                "",
+                "[[hooks.UserPromptSubmit]]",
+                'command = ["npx", "-y", "--package=@korso/shepherd", "shepherd-inbox-hook"]',
+            ].join("\n"),
+        };
+    }
+    return null;
+}
 // "created 3d ago · never used" / "created 3d ago · last used 2h ago" — helps
 // an operator tell which tokens are still active before revoking one.
 function tokenMeta(token, nowMs) {
@@ -27,13 +72,18 @@ function tokenMeta(token, nowMs) {
     return `${created} · ${used}`;
 }
 function installCommand(tool, hubUrl, token) {
-    if (tool === "generic") {
+    if (tool === "generic" || tool === "pi" || tool === "cursor") {
+        // PROGRAM names the tool in the presence feed; it defaults to
+        // `claude-code`, so JSON-config tools set it explicitly.
+        const env = { HUB_URL: hubUrl, SHEPHERD_TOKEN: token };
+        if (tool !== "generic")
+            env["PROGRAM"] = tool;
         return JSON.stringify({
             mcpServers: {
                 shepherd: {
                     command: "npx",
-                    args: ["-y", "-p", "@korso/shepherd", "shepherd-mcp"],
-                    env: { HUB_URL: hubUrl, SHEPHERD_TOKEN: token },
+                    args: ["-y", "--package=@korso/shepherd", "shepherd-mcp"],
+                    env,
                 },
             },
         }, null, 2);
@@ -41,12 +91,19 @@ function installCommand(tool, hubUrl, token) {
     // A single line with no shell-specific continuation character (`\` in
     // bash/zsh, backtick in PowerShell, `^` in cmd) so the command pastes
     // cleanly into any terminal.
-    return [
+    const envFlag = ENV_FLAG[tool];
+    const parts = [
         CLI_PREFIX[tool],
-        `-e HUB_URL=${hubUrl}`,
-        `-e SHEPHERD_TOKEN=${token}`,
-        "-- npx -y -p @korso/shepherd shepherd-mcp",
-    ].join(" ");
+        `${envFlag} HUB_URL=${hubUrl}`,
+        `${envFlag} SHEPHERD_TOKEN=${token}`,
+    ];
+    // PROGRAM defaults to claude-code, so only non-Claude tools set it.
+    if (tool === "codex")
+        parts.push(`${envFlag} PROGRAM=codex`);
+    // NOTE: long `--package=` form on purpose — `claude mcp add` (CLI) fails to
+    // parse a bare `-p` after the `--` separator ("error: unknown option '-s'").
+    parts.push("-- npx -y --package=@korso/shepherd shepherd-mcp");
+    return parts.join(" ");
 }
 export function ConnectAgent({ hubUrl }) {
     const client = useShepherdClient();
@@ -87,6 +144,7 @@ export function ConnectAgent({ hubUrl }) {
     async function generate() {
         setBusy(true);
         setError(null);
+        setStatus(null);
         try {
             const res = await client.mintAccountToken(name.trim() ? { name: name.trim() } : {});
             setRawToken(res.token);
@@ -119,12 +177,18 @@ export function ConnectAgent({ hubUrl }) {
         }
     }
     const command = installCommand(tool, directHubUrl, rawToken ?? TOKEN_PLACEHOLDER);
+    const hook = hookSnippet(tool);
     async function copyCommand() {
         await navigator.clipboard.writeText(command);
         setCopied(true);
         setTimeout(() => setCopied(false), 2000);
     }
-    return (_jsxs("section", { className: "shepherd-connect-agent", "aria-labelledby": headingId, children: [_jsxs("div", { className: "card-head", children: [_jsx("h3", { id: headingId, children: "Connect your agent" }), _jsx("p", { className: "card-sub", children: "Generate a token \u2014 it works across all your workspaces \u2014 then paste the command into your coding tool." }), _jsx("p", { className: "card-sub", children: "The first time the agent opens a repo, it'll ask which workspace to coordinate that repo with." })] }), _jsxs("div", { className: "card-body", children: [_jsxs("div", { className: "field", children: [_jsx("label", { htmlFor: "connect-tool", children: "Tool" }), _jsx("select", { id: "connect-tool", value: tool, onChange: (e) => setTool(e.target.value), children: TOOLS.map((t) => (_jsx("option", { value: t.id, children: t.label }, t.id))) })] }), _jsxs("div", { className: "field generate", children: [_jsx("label", { htmlFor: "token-name", children: "Token name (optional)" }), _jsxs("div", { className: "field__row", children: [_jsx("input", { id: "token-name", type: "text", value: name, onChange: (e) => setName(e.target.value), placeholder: "e.g. laptop" }), _jsx("button", { type: "button", onClick: () => void generate(), disabled: busy, children: "Generate token" })] })] }), error && _jsx("p", { role: "alert", children: error }), status && _jsx("p", { role: "status", children: status }), rawToken && (_jsx("p", { className: "token-once", role: "status", children: "Copy this token now \u2014 it won't be shown again." })), _jsxs("div", { className: "install-command", children: [_jsx("pre", { "data-testid": "install-command", children: command }), _jsx("button", { type: "button", className: "install-command__copy", "aria-label": copied ? "Copied" : "Copy command", title: copied ? "Copied" : "Copy", onClick: () => void copyCommand(), children: copied ? (_jsx("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: _jsx("path", { d: "M20 6 9 17l-5-5" }) })) : (_jsxs("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: [_jsx("rect", { x: "9", y: "9", width: "13", height: "13", rx: "2" }), _jsx("path", { d: "M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" })] })) })] }), _jsx("h4", { children: "Existing tokens" }), loading ? (_jsx("p", { role: "status", children: "Loading\u2026" })) : tokens.length === 0 ? (_jsx("p", { children: "No tokens yet." })) : (_jsx("ul", { children: tokens.map((t) => {
+    return (_jsxs("section", { className: "shepherd-connect-agent", "aria-labelledby": headingId, children: [_jsxs("div", { className: "card-head", children: [_jsx("h3", { id: headingId, children: "Connect your agent" }), _jsx("p", { className: "card-sub", children: "Generate a token \u2014 it works across all your workspaces \u2014 then paste the command into your coding tool." }), _jsx("p", { className: "card-sub", children: "The first time the agent opens a repo, it'll ask which workspace to coordinate that repo with." })] }), _jsxs("div", { className: "card-body", children: [_jsxs("div", { className: "field", children: [_jsx("label", { htmlFor: "connect-tool", children: "Tool" }), _jsx("select", { id: "connect-tool", value: tool, onChange: (e) => setTool(e.target.value), children: TOOLS.map((t) => (_jsx("option", { value: t.id, children: t.label }, t.id))) })] }), _jsxs("div", { className: "field generate", children: [_jsx("label", { htmlFor: "token-name", children: "Token name (optional)" }), _jsxs("div", { className: "field__row", children: [_jsx("input", { id: "token-name", type: "text", value: name, onChange: (e) => setName(e.target.value), onKeyDown: (e) => {
+                                            if (e.key === "Enter" && !busy) {
+                                                e.preventDefault();
+                                                void generate();
+                                            }
+                                        }, placeholder: "e.g. laptop" }), _jsx("button", { type: "button", onClick: () => void generate(), disabled: busy, children: "Generate token" })] })] }), error && _jsx("p", { role: "alert", children: error }), status && _jsx("p", { role: "status", children: status }), rawToken && (_jsx("p", { className: "token-once", role: "status", children: "Copy this token now \u2014 it won't be shown again." })), _jsxs("div", { className: "install-command", children: [_jsx("pre", { "data-testid": "install-command", children: command }), _jsx("button", { type: "button", className: "install-command__copy", "aria-label": copied ? "Copied" : "Copy command", title: copied ? "Copied" : "Copy", onClick: () => void copyCommand(), children: copied ? (_jsx("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: _jsx("path", { d: "M20 6 9 17l-5-5" }) })) : (_jsxs("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true", children: [_jsx("rect", { x: "9", y: "9", width: "13", height: "13", rx: "2" }), _jsx("path", { d: "M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" })] })) })] }), hook && (_jsxs("div", { className: "hook-setup", children: [_jsxs("p", { className: "card-sub", children: ["Recommended: merge this into ", _jsx("code", { children: hook.target }), " \u2014 it delivers teammate announcements to the agent and reminds it to link each repo before its first write."] }), _jsx("div", { className: "install-command", children: _jsx("pre", { "data-testid": "hook-snippet", children: hook.snippet }) })] })), _jsx("h4", { children: "Existing tokens" }), loading ? (_jsx("p", { role: "status", children: "Loading\u2026" })) : tokens.length === 0 ? (_jsx("p", { children: "No tokens yet." })) : (_jsx("ul", { children: tokens.map((t) => {
                             const name = t.name ?? t.id;
                             return (_jsxs("li", { children: [_jsx("span", { children: name }), _jsx("span", { className: "token-meta", children: tokenMeta(t, Date.now()) }), t.revokedAt ? (_jsx("span", { className: "revoked", children: "revoked" })) : (_jsx("button", { type: "button", "aria-label": `Revoke token ${name}`, onClick: () => void revoke(t.id), disabled: revokingId === t.id, children: "Revoke" }))] }, t.id));
                         }) }))] })] }));