@pebblehouse/odin-cli 0.4.0 → 0.4.2

package/dist/index.js

@@ -102,8 +102,13 @@ import { Command } from "commander";
 
 // src/auth/refresh.ts
 import { createClient } from "@supabase/supabase-js";
+import { existsSync as existsSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, readFileSync as readFileSync2, mkdirSync as mkdirSync2 } from "fs";
+import { dirname } from "path";
 var SUPABASE_URL = process.env.ODIN_SUPABASE_URL ?? "https://vdiwtiiksdyhlibqrngw.supabase.co";
 var SUPABASE_ANON_KEY = process.env.ODIN_SUPABASE_ANON_KEY ?? "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InZkaXd0aWlrc2R5aGxpYnFybmd3Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzM2ODM4NDksImV4cCI6MjA4OTI1OTg0OX0.gAccODqqhBnL_npqG7H42EvaT2CWR1P2pqo5NVjKFas";
+var REFRESH_THRESHOLD_SECONDS = 900;
+var LOCK_PATH = CREDENTIALS_PATH + ".lock";
+var LOCK_STALE_MS = 1e4;
 function createNodeClient() {
   return createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
     auth: {
@@ -112,15 +117,46 @@ function createNodeClient() {
     }
   });
 }
-async function getValidToken() {
-  const creds = getCredentials();
-  if (!creds) {
-    throw new Error("Not logged in. Run 'odin login' first.");
+function acquireLock() {
+  try {
+    if (existsSync2(LOCK_PATH)) {
+      try {
+        const stat = JSON.parse(readFileSync2(LOCK_PATH, "utf-8"));
+        if (Date.now() - stat.pid_time > LOCK_STALE_MS) {
+          unlinkSync2(LOCK_PATH);
+        } else {
+          return false;
+        }
+      } catch {
+        try {
+          unlinkSync2(LOCK_PATH);
+        } catch {
+        }
+      }
+    }
+    const dir = dirname(LOCK_PATH);
+    if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
+    writeFileSync2(LOCK_PATH, JSON.stringify({ pid: process.pid, pid_time: Date.now() }), { flag: "wx" });
+    return true;
+  } catch {
+    return false;
   }
-  const now = Math.floor(Date.now() / 1e3);
-  if (creds.expires_at > now + 60) {
-    return creds.access_token;
+}
+function releaseLock() {
+  try {
+    unlinkSync2(LOCK_PATH);
+  } catch {
   }
+}
+async function waitForLock(timeoutMs = 5e3) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (acquireLock()) return true;
+    await new Promise((r) => setTimeout(r, 50));
+  }
+  return false;
+}
+async function refreshTokens(creds) {
   const supabase = createNodeClient();
   const { data, error } = await supabase.auth.refreshSession({
     refresh_token: creds.refresh_token
@@ -128,13 +164,42 @@ async function getValidToken() {
   if (error || !data.session) {
     throw new Error("Session expired. Run 'odin login' to re-authenticate.");
   }
+  const now = Math.floor(Date.now() / 1e3);
   const newCreds = {
     access_token: data.session.access_token,
     refresh_token: data.session.refresh_token,
     expires_at: data.session.expires_at ?? now + 3600
   };
   saveCredentials(newCreds);
-  return newCreds.access_token;
+  return newCreds;
+}
+async function getValidToken() {
+  const creds = getCredentials();
+  if (!creds) {
+    throw new Error("Not logged in. Run 'odin login' first.");
+  }
+  const now = Math.floor(Date.now() / 1e3);
+  if (creds.expires_at > now + REFRESH_THRESHOLD_SECONDS) {
+    return creds.access_token;
+  }
+  const locked = await waitForLock();
+  try {
+    const freshCreds = getCredentials();
+    if (freshCreds && freshCreds.expires_at > now + REFRESH_THRESHOLD_SECONDS) {
+      return freshCreds.access_token;
+    }
+    const useForRefresh = freshCreds ?? creds;
+    const newCreds = await refreshTokens(useForRefresh);
+    return newCreds.access_token;
+  } catch (err) {
+    const retryCreds = getCredentials();
+    if (retryCreds && retryCreds.expires_at > now + REFRESH_THRESHOLD_SECONDS) {
+      return retryCreds.access_token;
+    }
+    throw err;
+  } finally {
+    if (locked) releaseLock();
+  }
 }
 
 // src/api-client.ts
@@ -195,7 +260,7 @@ pebblesCmd.command("update <slug>").description("Update a pebble").option("--slu
 
 // src/commands/documents.ts
 import { Command as Command2 } from "commander";
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 var docsCmd = new Command2("docs").description("Manage documents");
 docsCmd.command("list <slug>").description("List documents for a pebble").action(async (slug) => {
   const res = await apiRequest(`/pebbles/${slug}/documents`);
@@ -208,7 +273,7 @@ docsCmd.command("get <slug> <type>").description("Get document by type").action(
   if (res.error) process.exit(1);
 });
 docsCmd.command("create <slug> <type>").description("Create a document").requiredOption("--title <title>", "Document title").option("--file <path>", "Read content from file").option("--source <source>", "Source", "manual").action(async (slug, type, opts) => {
-  const content = opts.file ? readFileSync2(opts.file, "utf-8") : "";
+  const content = opts.file ? readFileSync3(opts.file, "utf-8") : "";
   const res = await apiRequest(`/pebbles/${slug}/documents`, {
     method: "POST",
     body: { doc_type: type, title: opts.title, content, source: opts.source }
@@ -224,7 +289,7 @@ docsCmd.command("delete <slug> <type>").description("Delete a document").action(
   if (res.error) process.exit(1);
 });
 docsCmd.command("update <slug> <type>").description("Update document content").requiredOption("--file <path>", "Read content from file").option("--source <source>", "Source", "manual").action(async (slug, type, opts) => {
-  const content = readFileSync2(opts.file, "utf-8");
+  const content = readFileSync3(opts.file, "utf-8");
   const res = await apiRequest(`/pebbles/${slug}/documents/${type}`, {
     method: "PUT",
     body: { content, source: opts.source }
@@ -307,7 +372,7 @@ var searchCmd = new Command6("search").description("Full-text search across Odin
 
 // src/commands/plans.ts
 import { Command as Command7 } from "commander";
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 var plansCmd = new Command7("plans").description("Manage plans");
 plansCmd.command("list <slug>").description("List plans for a pebble").action(async (slug) => {
   const res = await apiRequest(`/pebbles/${slug}/plans`);
@@ -328,7 +393,7 @@ plansCmd.command("get <slug> <id>").description("Get plan with phases").action(a
   process.stdout.write(JSON.stringify(result) + "\n");
 });
 plansCmd.command("create <slug> <title>").description("Create a plan").option("--description <description>", "Plan description").option("--file <path>", "Read description from file").option("--source <source>", "Source", "claude-code").action(async (slug, title, opts) => {
-  const description = opts.file ? readFileSync3(opts.file, "utf-8") : opts.description ?? null;
+  const description = opts.file ? readFileSync4(opts.file, "utf-8") : opts.description ?? null;
   const res = await apiRequest(`/pebbles/${slug}/plans`, {
     method: "POST",
     body: { title, description, source: opts.source }
@@ -355,28 +420,24 @@ plansCmd.command("delete <slug> <id>").description("Delete a plan").action(async
   process.stdout.write(JSON.stringify(res) + "\n");
   if (res.error) process.exit(1);
 });
-plansCmd.command("add-phase <slug> <planId> <title>").description("Add a phase to a plan").requiredOption("--phase-number <number>", "Phase number", parseInt).option("--description <description>", "Phase description").option("--detail-type <type>", "Detail type (e.g. agent_spec, document)").option("--detail-id <id>", "Detail ID (UUID of linked entity)").action(async (slug, planId, title, opts) => {
+plansCmd.command("add-phase <slug> <planId> <title>").description("Add a phase to a plan").requiredOption("--phase-number <number>", "Phase number", parseInt).option("--description <description>", "Phase description").action(async (slug, planId, title, opts) => {
   const res = await apiRequest(`/pebbles/${slug}/plans/${planId}/phases`, {
     method: "POST",
     body: {
       phase_number: opts.phaseNumber,
       title,
-      description: opts.description ?? null,
-      detail_type: opts.detailType ?? null,
-      detail_id: opts.detailId ?? null
+      description: opts.description ?? null
     }
   });
   process.stdout.write(JSON.stringify(res) + "\n");
   if (res.error) process.exit(1);
 });
-plansCmd.command("update-phase <slug> <planId> <phaseId>").description("Update a phase").option("--title <title>", "Phase title").option("--status <status>", "Phase status (pending|in_progress|completed|skipped)").option("--notes <notes>", "Phase notes").option("--description <description>", "Phase description").option("--detail-type <type>", "Detail type (e.g. agent_spec, document)").option("--detail-id <id>", "Detail ID (UUID of linked entity)").action(async (slug, planId, phaseId, opts) => {
+plansCmd.command("update-phase <slug> <planId> <phaseId>").description("Update a phase").option("--title <title>", "Phase title").option("--status <status>", "Phase status (pending|in_progress|completed|skipped)").option("--notes <notes>", "Phase notes").option("--description <description>", "Phase description").action(async (slug, planId, phaseId, opts) => {
   const body = {};
   if (opts.title) body.title = opts.title;
   if (opts.status) body.status = opts.status;
   if (opts.notes) body.notes = opts.notes;
   if (opts.description) body.description = opts.description;
-  if (opts.detailType) body.detail_type = opts.detailType;
-  if (opts.detailId) body.detail_id = opts.detailId;
   const res = await apiRequest(`/pebbles/${slug}/plans/${planId}/phases/${phaseId}`, {
     method: "PUT",
     body
@@ -391,6 +452,25 @@ plansCmd.command("delete-phase <slug> <planId> <phaseId>").description("Delete a
   process.stdout.write(JSON.stringify(res) + "\n");
   if (res.error) process.exit(1);
 });
+plansCmd.command("add-phase-link <slug> <planId> <phaseId>").description("Add a link from a phase to a spec or document").requiredOption("--link-type <type>", "Link type (spec|plan_doc)").requiredOption("--target-type <type>", "Target type (agent_spec|document)").requiredOption("--target-id <id>", "Target entity UUID").action(async (slug, planId, phaseId, opts) => {
+  const res = await apiRequest(`/pebbles/${slug}/plans/${planId}/phases/${phaseId}/links`, {
+    method: "POST",
+    body: {
+      link_type: opts.linkType,
+      target_type: opts.targetType,
+      target_id: opts.targetId
+    }
+  });
+  process.stdout.write(JSON.stringify(res) + "\n");
+  if (res.error) process.exit(1);
+});
+plansCmd.command("remove-phase-link <slug> <planId> <phaseId> <linkId>").description("Remove a link from a phase").action(async (slug, planId, phaseId, linkId) => {
+  const res = await apiRequest(`/pebbles/${slug}/plans/${planId}/phases/${phaseId}/links/${linkId}`, {
+    method: "DELETE"
+  });
+  process.stdout.write(JSON.stringify(res) + "\n");
+  if (res.error) process.exit(1);
+});
 
 // src/commands/conversations.ts
 import { Command as Command8 } from "commander";
@@ -447,7 +527,7 @@ conversationsCmd.command("delete <slug> <id>").description("Delete a conversatio
 
 // src/commands/specs.ts
 import { Command as Command9 } from "commander";
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 var specsCmd = new Command9("specs").description("Manage agent specs");
 specsCmd.command("list <slug>").description("List specs for a pebble").option("--source <source>", "Filter by source (claude-code, superpowers, etc.)").action(async (slug, opts) => {
   const params = {};
@@ -462,7 +542,7 @@ specsCmd.command("get <slug> <id>").description("Get a spec by ID").action(async
   if (res.error) process.exit(1);
 });
 specsCmd.command("create <slug> <title>").description("Create a spec").requiredOption("--spec-type <type>", "Spec type (e.g. brainstorm, plan, research)").option("--source <source>", "Source agent", "claude-code").option("--content <content>", "Spec content").option("--file <path>", "Read content from file").option("--session-id <id>", "Link to active session").action(async (slug, title, opts) => {
-  const content = opts.file ? readFileSync4(opts.file, "utf-8") : opts.content ?? "";
+  const content = opts.file ? readFileSync5(opts.file, "utf-8") : opts.content ?? "";
   const res = await apiRequest(`/pebbles/${slug}/agent-specs`, {
     method: "POST",
     body: {
@@ -481,7 +561,7 @@ specsCmd.command("update <slug> <id>").description("Update a spec").option("--ti
   if (opts.title) body.title = opts.title;
   if (opts.specType) body.spec_type = opts.specType;
   if (opts.source) body.source = opts.source;
-  if (opts.file) body.content = readFileSync4(opts.file, "utf-8");
+  if (opts.file) body.content = readFileSync5(opts.file, "utf-8");
   else if (opts.content) body.content = opts.content;
   const res = await apiRequest(`/pebbles/${slug}/agent-specs/${id}`, {
     method: "PUT",
@@ -553,7 +633,7 @@ versionsCmd.command("get <slug> <docType> <versionId>").description("Get a speci
 
 // src/commands/guidelines.ts
 import { Command as Command12 } from "commander";
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync6 } from "fs";
 var guidelinesCmd = new Command12("guidelines").description("Manage global guidelines");
 guidelinesCmd.command("list").description("List guidelines").option("--category <category>", "Filter by category").option("--status <status>", "Filter by status (default: active)").option("--all", "Include deprecated guidelines").action(async (opts) => {
   const params = new URLSearchParams();
@@ -571,7 +651,7 @@ guidelinesCmd.command("get <id>").description("Get a guideline by ID").action(as
   if (res.error) process.exit(1);
 });
 guidelinesCmd.command("create <title>").description("Create a guideline").option("--category <category>", "Category", "other").option("--content <content>", "Guideline content").option("--file <path>", "Read content from file").option("--source <source>", "Source", "manual").action(async (title, opts) => {
-  const content = opts.file ? readFileSync5(opts.file, "utf-8") : opts.content ?? "";
+  const content = opts.file ? readFileSync6(opts.file, "utf-8") : opts.content ?? "";
   const res = await apiRequest("/guidelines", {
     method: "POST",
     body: { category: opts.category, title, content, source: opts.source }
@@ -582,7 +662,7 @@ guidelinesCmd.command("create <title>").description("Create a guideline").option
 guidelinesCmd.command("update <id>").description("Update a guideline").option("--title <title>", "New title").option("--content <content>", "New content").option("--file <path>", "Read content from file").option("--category <category>", "New category").option("--status <status>", "New status (active|deprecated)").option("--source <source>", "Source").action(async (id, opts) => {
   const body = {};
   if (opts.title) body.title = opts.title;
-  if (opts.file) body.content = readFileSync5(opts.file, "utf-8");
+  if (opts.file) body.content = readFileSync6(opts.file, "utf-8");
   else if (opts.content) body.content = opts.content;
   if (opts.category) body.category = opts.category;
   if (opts.status) body.status = opts.status;
@@ -661,11 +741,11 @@ observationsCmd.command("synthesize [slug]").description("Trigger observation sy
 });
 
 // src/index.ts
-import { readFileSync as readFileSync6 } from "fs";
+import { readFileSync as readFileSync7 } from "fs";
 import { fileURLToPath } from "url";
-import { dirname, resolve } from "path";
-var __dirname = dirname(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(readFileSync6(resolve(__dirname, "../package.json"), "utf-8"));
+import { dirname as dirname2, resolve } from "path";
+var __dirname = dirname2(fileURLToPath(import.meta.url));
+var pkg = JSON.parse(readFileSync7(resolve(__dirname, "../package.json"), "utf-8"));
 var GOLD = "\x1B[33m";
 var DIM = "\x1B[2m";
 var RESET = "\x1B[0m";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pebblehouse/odin-cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "description": "CLI for Odin — the knowledge backbone for Pebble House",
   "bin": {