loopshouse 0.2.0 → 0.2.1

package/README.md

@@ -46,25 +46,25 @@ listings); ideator conversations persist per hackathon in `~/.loops/sessions/`.
 
 ## Commands
 
-| Group | Commands |
-|-------|----------|
-| root | `add <slug> [sponsorSlug]` (interactive setup: CLI install/update, skill into agents, auth) |
-| `auth` | `login`, `verify`, `status`, `logout` |
-| `hackathon` | `ideate` (1 credit/turn; stateful session, `--withProject`, `--new`), `session` (show/`--clear`), `submit` |
-| `project` | `get` (your one project for a hackathon), `create`, `update` (PATCH — only passed fields change; no project id, yours is resolved) |
-| `knowledge` | `query` (1 credit/query — graph-RAG evidence from a sponsor's docs) |
-| `artifact` | `list`, `save`, `update`, `remove` (ideation scratchpad) |
-| root | `credits` (remaining agent credits), `evaluate` (per-sponsor evaluator prompt; your project auto-included) |
+| Group       | Commands                                                                                                                           |
+| ----------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| root        | `add <slug> [sponsorSlug]` (interactive setup: CLI install/update, skill into agents, auth)                                        |
+| `auth`      | `login`, `verify`, `status`, `logout`                                                                                              |
+| `hackathon` | `ideate` (1 credit/turn; stateful session, `--withProject`, `--new`), `session` (show/`--clear`), `submit`                         |
+| `project`   | `get` (your one project for a hackathon), `create`, `update` (PATCH — only passed fields change; no project id, yours is resolved) |
+| `knowledge` | `query` (1 credit/query — graph-RAG evidence from a sponsor's docs)                                                                |
+| `artifact`  | `list`, `save`, `update`, `remove` (ideation scratchpad)                                                                           |
+| root        | `credits` (remaining agent credits), `evaluate` (per-sponsor evaluator prompt; your project auto-included)                         |
 
 ## Authentication
 
 Auth uses Supabase Auth against the Loops platform. Three flows:
 
-| Flow | Command |
-|------|---------|
-| GitHub OAuth | `loops auth login --provider github` |
-| Google OAuth | `loops auth login --provider google` |
-| Email OTP | `loops auth login --email you@x.com` then `loops auth verify --email you@x.com --code 123456` |
+| Flow         | Command                                                                                       |
+| ------------ | --------------------------------------------------------------------------------------------- |
+| GitHub OAuth | `loops auth login --provider github`                                                          |
+| Google OAuth | `loops auth login --provider google`                                                          |
+| Email OTP    | `loops auth login --email you@x.com` then `loops auth verify --email you@x.com --code 123456` |
 
 OAuth runs a localhost callback server (default port `54321`, `--port` to
 change), opens your browser, and exchanges the PKCE code for a session.
@@ -82,11 +82,11 @@ loops --llms         # print the machine-readable command manifest
 
 ## Configuration
 
-| Env var | Default | Purpose |
-|---------|---------|---------|
-| `LOOPS_PLATFORM_URL` | `https://loops-platform.vercel.app` | Platform API origin |
-| `LOOPS_SUPABASE_URL` | (baked) | Supabase project URL |
-| `LOOPS_SUPABASE_ANON_KEY` | (baked) | Supabase anon key |
+| Env var                   | Default                             | Purpose              |
+| ------------------------- | ----------------------------------- | -------------------- |
+| `LOOPS_PLATFORM_URL`      | `https://loops-platform.vercel.app` | Platform API origin  |
+| `LOOPS_SUPABASE_URL`      | (baked)                             | Supabase project URL |
+| `LOOPS_SUPABASE_ANON_KEY` | (baked)                             | Supabase anon key    |
 
 Point these at `http://localhost:3000` + your local Supabase to develop against
 a local stack.

package/dist/loops.js

@@ -50978,7 +50978,7 @@ import path4 from "node:path";
 import fs4 from "node:fs";
 var SUPABASE_URL = process.env.LOOPS_SUPABASE_URL ?? "https://ennlvrjxpqexvgfhfiaw.supabase.co";
 var SUPABASE_ANON_KEY = process.env.LOOPS_SUPABASE_ANON_KEY ?? "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImVubmx2cmp4cHFleHZnZmhmaWF3Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzgwOTY3NTEsImV4cCI6MjA5MzY3Mjc1MX0.chKog_0lD39fqQi7R8pwhvTLWxEdwNidS-_BFtlknXE";
-var VERSION = "0.2.0";
+var VERSION = "0.2.1";
 var PLATFORM_URL = (process.env.LOOPS_PLATFORM_URL ?? "https://www.loops.house").replace(/\/+$/, "");
 var CONFIG_DIR = path4.join(os4.homedir(), ".loops");
 var CREDENTIALS_PATH = path4.join(CONFIG_DIR, "credentials.json");
@@ -51052,7 +51052,11 @@ var DEFAULT_CALLBACK_PORT = 54321;
 function openBrowser(url2) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   try {
-    const child = spawn(cmd, [url2], { stdio: "ignore", detached: true, shell: process.platform === "win32" });
+    const child = spawn(cmd, [url2], {
+      stdio: "ignore",
+      detached: true,
+      shell: process.platform === "win32"
+    });
     child.on("error", () => {});
     child.unref();
   } catch {}
@@ -51104,6 +51108,11 @@ function callbackPage(ok, detail) {
 }
 function waitForOAuthCallback(port) {
   return new Promise((resolve3) => {
+    const finish = (result) => {
+      clearTimeout(timer);
+      server.close();
+      resolve3(result);
+    };
     const server = createServer((req, res) => {
       const reqUrl = new URL(req.url ?? "/", `http://localhost:${port}`);
       if (reqUrl.pathname !== "/callback") {
@@ -51112,18 +51121,19 @@ function waitForOAuthCallback(port) {
       }
       const code = reqUrl.searchParams.get("code");
       const errDetail = reqUrl.searchParams.get("error_description");
-      res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" }).end(callbackPage(Boolean(code), errDetail ?? undefined));
-      server.close();
+      res.writeHead(200, {
+        "Content-Type": "text/html; charset=utf-8",
+        Connection: "close"
+      }).end(callbackPage(Boolean(code), errDetail ?? undefined));
       if (code)
-        resolve3({ ok: true, code });
+        finish({ ok: true, code });
       else
-        resolve3({ ok: false, message: errDetail || "No authorization code received" });
+        finish({ ok: false, message: errDetail || "No authorization code received" });
     });
-    server.on("error", (e) => resolve3({ ok: false, message: `Loopback server failed: ${e.message}` }));
+    server.on("error", (e) => finish({ ok: false, message: `Loopback server failed: ${e.message}` }));
     server.listen(port);
-    setTimeout(() => {
-      server.close();
-      resolve3({ ok: false, message: "Timed out waiting for the browser callback (2 min)" });
+    const timer = setTimeout(() => {
+      finish({ ok: false, message: "Timed out waiting for the browser callback (2 min)" });
     }, 120000);
   });
 }
@@ -51177,13 +51187,55 @@ async function oauthLogin(provider, port, onUrl) {
   });
   return { email: sess.user?.email, userId: sess.user?.id };
 }
+async function linkOAuthIdentity(provider, port, onUrl) {
+  const creds = loadCredentials();
+  if (!creds)
+    throw new Error("Not signed in — run `loops auth login` first.");
+  const supabase = createSupabase();
+  const { error: sessErr } = await supabase.auth.setSession({
+    access_token: creds.access_token,
+    refresh_token: creds.refresh_token
+  });
+  if (sessErr)
+    throw new Error(`Session expired — run \`loops auth login\` first (${sessErr.message})`);
+  const redirectTo = `http://localhost:${port}/callback`;
+  const { data, error: error51 } = await supabase.auth.linkIdentity({
+    provider,
+    options: {
+      redirectTo,
+      skipBrowserRedirect: true,
+      queryParams: { prompt: "select_account" }
+    }
+  });
+  if (error51 || !data?.url)
+    throw new Error(error51?.message ?? "Failed to start identity linking");
+  const callback = waitForOAuthCallback(port);
+  onUrl?.(data.url);
+  openBrowser(data.url);
+  const result = await callback;
+  if (!result.ok)
+    throw new Error(result.message);
+  const { data: sess, error: exErr } = await supabase.auth.exchangeCodeForSession(result.code);
+  if (exErr || !sess.session)
+    throw new Error(exErr?.message ?? "Code exchange failed");
+  saveCredentials({
+    access_token: sess.session.access_token,
+    refresh_token: sess.session.refresh_token,
+    expires_at: sess.session.expires_at
+  });
+  return {
+    email: sess.user?.email,
+    userId: sess.user?.id,
+    identities: (sess.user?.identities ?? []).map((i) => i.provider)
+  };
+}
 var auth = exports_Cli.create("auth", {
   description: "Authenticate with the Loops House platform"
 });
 auth.command("login", {
   description: "Log in via browser OAuth (GitHub/Google) or an email one-time code",
   options: exports_external.object({
-    provider: exports_external.enum(["github", "google"]).optional().describe("OAuth provider (default github). Ignored when --email is set."),
+    provider: exports_external.enum(["github", "google"]).optional().describe("OAuth provider (default google). Ignored when --email is set."),
     email: exports_external.string().email().optional().describe("Log in with an email one-time code instead of a browser"),
     port: exports_external.number().default(DEFAULT_CALLBACK_PORT).describe("Local port for the OAuth callback server")
   }),
@@ -51195,8 +51247,8 @@ auth.command("login", {
     message: exports_external.string().optional()
   }),
   examples: [
-    { options: { provider: "github" }, description: "Log in with GitHub" },
     { options: { provider: "google" }, description: "Log in with Google" },
+    { options: { provider: "github" }, description: "Log in with GitHub" },
     { options: { email: "you@example.com" }, description: "Send an email one-time code" }
   ],
   async run({ options, error: error51, agent }) {
@@ -51212,7 +51264,11 @@ auth.command("login", {
           const res = await verifyOtp(options.email, code);
           return { status: "authenticated", ...res };
         } catch (e) {
-          return error51({ code: "OTP_VERIFY_FAILED", message: e.message, retryable: true });
+          return error51({
+            code: "OTP_VERIFY_FAILED",
+            message: e.message,
+            retryable: true
+          });
         }
       }
       return {
@@ -51221,7 +51277,7 @@ auth.command("login", {
         message: `Code sent to ${options.email}. Verify with: loops auth verify --email ${options.email} --code <code>`
       };
     }
-    const provider = options.provider ?? "github";
+    const provider = options.provider ?? "google";
     try {
       const res = await oauthLogin(provider, options.port, (url2) => {
         if (!agent) {
@@ -51250,7 +51306,10 @@ auth.command("verify", {
     userId: exports_external.string().optional()
   }),
   examples: [
-    { options: { email: "you@example.com", code: "123456" }, description: "Verify the emailed code" }
+    {
+      options: { email: "you@example.com", code: "123456" },
+      description: "Verify the emailed code"
+    }
   ],
   async run({ options, error: error51 }) {
     try {
@@ -51261,6 +51320,41 @@ auth.command("verify", {
     }
   }
 });
+auth.command("link", {
+  description: "Attach a GitHub/Google identity to the account you're signed in to. Use when provider sign-in fails with 'multiple accounts with the same email' — after linking, that provider always signs in to THIS account.",
+  options: exports_external.object({
+    provider: exports_external.enum(["github", "google"]).describe("OAuth provider identity to link"),
+    port: exports_external.number().default(DEFAULT_CALLBACK_PORT).describe("Local port for the OAuth callback server")
+  }),
+  alias: { provider: "p" },
+  output: exports_external.object({
+    status: exports_external.string(),
+    email: exports_external.string().optional(),
+    userId: exports_external.string().optional(),
+    identities: exports_external.array(exports_external.string())
+  }),
+  examples: [
+    {
+      options: { provider: "github" },
+      description: "Link your GitHub identity to the signed-in account"
+    }
+  ],
+  async run({ options, error: error51, agent }) {
+    try {
+      const res = await linkOAuthIdentity(options.provider, options.port, (url2) => {
+        if (!agent) {
+          console.error(`Opening browser to link your ${options.provider} identity…`);
+          console.error(`If it doesn't open, visit:
+${url2}
+`);
+        }
+      });
+      return { status: "linked", ...res };
+    } catch (e) {
+      return error51({ code: "LINK_FAILED", message: e.message, retryable: true });
+    }
+  }
+});
 auth.command("status", {
   description: "Show the current authentication status",
   output: exports_external.object({
@@ -51293,7 +51387,11 @@ var NOT_AUTHENTICATED = {
     description: "To authenticate:",
     commands: [
       { command: "auth login", description: "Log in via GitHub or Google (browser)" },
-      { command: "auth login", options: { email: true }, description: "Log in with an email one-time code" }
+      {
+        command: "auth login",
+        options: { email: true },
+        description: "Log in with an email one-time code"
+      }
     ]
   }
 };
@@ -51491,7 +51589,10 @@ hackathon.command("ideate", {
   output: exports_external.object({ response: exports_external.string(), sessionTurns: exports_external.number() }),
   examples: [
     {
-      options: { hackathonSlug: "my-hackathon", message: "Suggest a project using the sponsor APIs" },
+      options: {
+        hackathonSlug: "my-hackathon",
+        message: "Suggest a project using the sponsor APIs"
+      },
       description: "Ask the mentor for an idea"
     },
     {
@@ -51560,7 +51661,11 @@ hackathon.command("submit", {
   output: submissionOutput,
   examples: [
     {
-      options: { hackathonSlug: "my-hackathon", name: "My Project", repoUrl: "https://github.com/me/proj" },
+      options: {
+        hackathonSlug: "my-hackathon",
+        name: "My Project",
+        repoUrl: "https://github.com/me/proj"
+      },
       description: "Submit a project"
     }
   ],
@@ -51612,9 +51717,7 @@ project.command("get", {
     exists: exports_external.boolean(),
     project: projectShape.nullable()
   }),
-  examples: [
-    { options: { hackathonSlug: "my-hackathon" }, description: "Look up your project" }
-  ],
+  examples: [{ options: { hackathonSlug: "my-hackathon" }, description: "Look up your project" }],
   run: authed(async ({ options, session, ok }) => {
     const result = await apiGet(session.accessToken, `/api/v1/hackathons/${options.hackathonSlug}/my-project`);
     return ok(result, {
@@ -51699,7 +51802,9 @@ knowledge.command("query", {
     hackathonSlug: exports_external.string().describe("Hackathon slug the sponsor belongs to"),
     sponsorSlug: exports_external.string().describe("Sponsor slug whose knowledge graph to query"),
     query: exports_external.string().describe("A focused question about the sponsor's products, docs, or SDKs"),
-    mode: exports_external.enum(["mix", "local", "global", "hybrid", "naive", "bypass"]).optional().describe("'mix' = balanced (default), 'local' = entity-centric, 'global' = relation-centric")
+    mode: exports_external.enum(["mix", "local", "global", "hybrid", "naive", "bypass"]).optional().describe("'mix' = balanced (default), 'local' = entity-centric, 'global' = relation-centric"),
+    hlKeywords: exports_external.array(exports_external.string()).optional().describe("2-5 high-level concept keywords — supplying them skips a server-side LLM call"),
+    llKeywords: exports_external.array(exports_external.string()).optional().describe("2-5 specific low-level terms (APIs, product names) that focus retrieval")
   }),
   alias: { sponsorSlug: "s", query: "q" },
   output: exports_external.object({ evidence: exports_external.string() }),
@@ -51713,7 +51818,12 @@ knowledge.command("query", {
       description: "Ask about a sponsor's SDK"
     }
   ],
-  run: authed(({ options, session }) => apiPost(session.accessToken, `/api/v1/hackathons/${options.hackathonSlug}/sponsors/${options.sponsorSlug}/knowledge/query`, { query: options.query, mode: options.mode }))
+  run: authed(({ options, session }) => apiPost(session.accessToken, `/api/v1/hackathons/${options.hackathonSlug}/sponsors/${options.sponsorSlug}/knowledge/query`, {
+    query: options.query,
+    mode: options.mode,
+    hlKeywords: options.hlKeywords,
+    llKeywords: options.llKeywords
+  }))
 });
 
 // src/artifact.ts
@@ -53496,7 +53606,11 @@ var TARGETS = {
 };
 var ALL_TARGETS = Object.keys(TARGETS);
 function npm(args, timeout = 60000) {
-  const r2 = spawnSync("npm", args, { encoding: "utf8", timeout, shell: process.platform === "win32" });
+  const r2 = spawnSync("npm", args, {
+    encoding: "utf8",
+    timeout,
+    shell: process.platform === "win32"
+  });
   return { ok: r2.status === 0, stdout: r2.stdout ?? "" };
 }
 function globalCliVersion() {
@@ -53669,7 +53783,7 @@ var cli = exports_Cli.create("loops", {
   description: "Loops House CLI — authenticate, ideate with AI, query sponsor knowledge graphs, and submit projects from your terminal or AI agent. Scoped to one hackathon at a time.",
   sync: {
     suggestions: [
-      "log in to loops with github",
+      "log in to loops with google",
       "ideate a project for a hackathon",
       "query a sponsor's knowledge graph",
       "evaluate my project against a sponsor"
@@ -53702,8 +53816,15 @@ cli.command("add", {
   }),
   examples: [
     { args: { hackathonSlug: "my-hackathon" }, description: "Interactive setup for a hackathon" },
-    { args: { hackathonSlug: "my-hackathon", sponsorSlug: "acme" }, description: "Install Acme's sponsor-focused skill" },
-    { args: { hackathonSlug: "my-hackathon" }, options: { yes: true }, description: "Non-interactive, defaults" }
+    {
+      args: { hackathonSlug: "my-hackathon", sponsorSlug: "acme" },
+      description: "Install Acme's sponsor-focused skill"
+    },
+    {
+      args: { hackathonSlug: "my-hackathon" },
+      options: { yes: true },
+      description: "Non-interactive, defaults"
+    }
   ],
   run: ({ args, options, error: error51 }) => runAdd(args.hackathonSlug, args.sponsorSlug, options, error51)
 });
@@ -53749,4 +53870,5 @@ cli.command("evaluate", {
     });
   })
 });
-cli.serve();
+await cli.serve();
+process.exit();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopshouse",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Loops House CLI — manage hackathon projects, ideate with AI, query sponsor knowledge graphs, and submit from your terminal or AI agent",
   "license": "MIT",
@@ -19,7 +19,10 @@
     "dev": "bun run bin/loops.ts",
     "build": "bun build bin/loops.ts --outdir dist --target node && node -e \"const fs=require('fs');const f='dist/loops.js';let c=fs.readFileSync(f,'utf8').replace(/^#!.*\\n/,'');fs.writeFileSync(f,'#!/usr/bin/env node\\n'+c);fs.chmodSync(f,0o755)\"",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "bun run build"
+    "prepublishOnly": "bun run build",
+    "lint": "eslint . --max-warnings=0",
+    "format": "prettier --write .",
+    "format:check": "prettier --check ."
   },
   "dependencies": {
     "@clack/prompts": "^1.5.1",
@@ -29,6 +32,9 @@
   },
   "devDependencies": {
     "@types/node": "^20",
-    "typescript": "^5"
+    "eslint": "^10.4.1",
+    "prettier": "^3.8.4",
+    "typescript": "^5",
+    "typescript-eslint": "^8.61.0"
   }
 }