npm - @trekagent/claude - Versions diffs - 0.2.0 → 0.3.0 - Mend

@trekagent/claude 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/README.md CHANGED Viewed

@@ -6,8 +6,9 @@ API token — so an agent starts reporting presence and working the ready-task f
 you restart Claude Code.
 If no token is already available, `init` **opens your browser** so you can sign in or create an
-account — the token is then created and delivered straight back to the installer over a localhost
-loopback listener. No copy-paste required.
+account and **pick a project** — the token (and the selected project) are then delivered straight
+back to the installer over a localhost loopback listener and written as `TREK_TOKEN` /
+`TREK_PROJECT_ID`. No copy-paste required.
 ## Usage
@@ -46,8 +47,10 @@ npx @trekagent/claude init --uninstall
 3. A `trk_` token already wired into project `./.claude/settings.local.json` or user
    `~/.claude/settings.local.json` (skipped when `--login` is passed).
 4. **Browser login** (interactive terminals, unless `--no-browser`): opens the cockpit
-   `cli-auth` page, you sign in / sign up, and the token is delivered back automatically over a
-   loopback listener bound to `127.0.0.1`.
+   `cli-auth` page, you sign in / sign up and select a project, and the token plus the chosen
+   project are delivered back automatically over a loopback listener bound to `127.0.0.1`. The
+   selected project is written as `TREK_PROJECT_ID` (an explicit `--project-id` still applies to
+   the non-browser paths).
 5. Manual paste prompt — the fallback for `--no-browser`, non-interactive shells, or if the
    browser flow times out (3 min). Points you at **Settings → API tokens** in the cockpit.

package/bin/cli.mjs CHANGED Viewed

@@ -146,8 +146,12 @@ display:flex;align-items:center;justify-content:center;height:100vh;margin:0}
 .card{text-align:center;max-width:30rem;padding:2rem}h1{font-size:1.4rem}p{color:#f28b82}</style></head>
 <body><div class="card"><h1>Trek CLI</h1><p>${String(msg).replace(/[<>&]/g, '')}</p></div></body></html>`;
-// Loopback browser-login flow. Resolves with a trk_ token, or null if it could
-// not complete (timeout / browser failure / user error) so the caller can fall back.
+// Loopback browser-login flow. Resolves with { token, projectId } on success, or
+// null if it could not complete (timeout / browser failure / user error) so the
+// caller can fall back. The cockpit success callback contract is:
+//   success: http://127.0.0.1:<port>/callback?token=<trk_...>&project=<projectId>&state=<nonce>
+//   error:   http://127.0.0.1:<port>/callback?error=<msg>&state=<nonce>
+// Project selection is mandatory in the cockpit, so `project` is normally present.
 function browserLogin(flags) {
   return new Promise((resolve) => {
     const expectedState = randomUUID();
@@ -176,6 +180,7 @@ function browserLogin(flags) {
       const token = url.searchParams.get('token');
       const state = url.searchParams.get('state');
       const error = url.searchParams.get('error');
+      const projectId = url.searchParams.get('project') || '';
       // A mismatched state must NOT resolve — keep waiting.
       if (state !== expectedState) {
@@ -195,7 +200,7 @@ function browserLogin(flags) {
       if (looksLikeToken(token)) {
         res.writeHead(200, { 'content-type': 'text/html; charset=utf-8' });
         res.end(SUCCESS_HTML);
-        finish(token);
+        finish({ token, projectId });
         return;
       }
@@ -246,24 +251,28 @@ async function pasteToken() {
   return tok;
 }
+// Resolve a token (and, where available, a project id) following this precedence.
+// Always returns { token, projectId }; projectId is '' for every path except a
+// successful browser login, where the cockpit's mandatory project selection is
+// delivered back over the loopback callback.
 async function resolveToken(flags) {
   // 1. explicit flag
-  if (typeof flags.token === 'string' && flags.token) return flags.token;
+  if (typeof flags.token === 'string' && flags.token) return { token: flags.token, projectId: '' };
   // 2. environment
-  if (process.env.TREK_TOKEN) { skip('using TREK_TOKEN from environment'); return process.env.TREK_TOKEN; }
+  if (process.env.TREK_TOKEN) { skip('using TREK_TOKEN from environment'); return { token: process.env.TREK_TOKEN, projectId: '' }; }
   // 3. reuse an existing token from settings (unless --login forces re-auth)
   if (!flags.login) {
     const existing = detectExistingToken();
-    if (existing) { skip(`reusing TREK_TOKEN from ${rel(existing.path)}`); return existing.token; }
+    if (existing) { skip(`reusing TREK_TOKEN from ${rel(existing.path)}`); return { token: existing.token, projectId: '' }; }
   }
   // 4. browser login (interactive, unless --no-browser)
   if (process.stdin.isTTY && !flags['no-browser']) {
-    const tok = await browserLogin(flags);
-    if (looksLikeToken(tok)) { ok('signed in via browser'); return tok; }
+    const result = await browserLogin(flags);
+    if (result && looksLikeToken(result.token)) { ok('signed in via browser'); return { token: result.token, projectId: result.projectId || '' }; }
     warn('falling back to manual token entry.');
   }
   // 5. manual paste fallback (also the --no-browser / non-TTY path)
-  return pasteToken();
+  return { token: await pasteToken(), projectId: '' };
 }
 // --- settings.local.json: merge env block ----------------------------------
@@ -316,7 +325,7 @@ function installPlugin(bin, marketplaceRepo) {
 async function init(flags) {
   const userScope = !!flags.user;
   const apiUrl = (typeof flags['api-url'] === 'string' && flags['api-url']) || DEFAULT_API_URL;
-  const projectId = typeof flags['project-id'] === 'string' ? flags['project-id'] : process.env.TREK_PROJECT_ID || '';
+  const flagProjectId = typeof flags['project-id'] === 'string' ? flags['project-id'] : process.env.TREK_PROJECT_ID || '';
   const marketplaceRepo = (typeof flags.marketplace === 'string' && flags.marketplace) || DEFAULT_MARKETPLACE_REPO;
   log(c.bold(`\nTrek installer — ${userScope ? 'user' : 'project'} scope`));
@@ -332,7 +341,10 @@ async function init(flags) {
     installPlugin(bin, marketplaceRepo);
   }
-  const token = await resolveToken(flags);
+  const { token, projectId: browserProjectId } = await resolveToken(flags);
+  // The browser flow's mandatory project selection wins; otherwise fall back to
+  // the explicit --project-id / $TREK_PROJECT_ID resolution.
+  const projectId = browserProjectId || flagProjectId;
   const claudeDir = userScope ? join(homedir(), '.claude') : join(CWD, '.claude');
   writeTokenEnv(claudeDir, apiUrl, token, projectId);
   if (!userScope) ensureGitignore(CWD, ['.claude/settings.local.json']);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@trekagent/claude",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "One-command installer for Trek: installs the Trek Claude Code plugin (skill + hooks + MCP) from the Trek marketplace and wires your API token.",
   "private": false,
   "type": "module",