npm - @indexnetwork/cli - Versions diffs - 0.17.0-rc.66.1 → 0.29.0-rc.88.2 - Mend

@indexnetwork/cli 0.17.0-rc.66.1 → 0.29.0-rc.88.2

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/dist/index.js CHANGED Viewed

@@ -1,25 +1,11 @@
 #!/usr/bin/env node
-var __defProp = Object.defineProperty;
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {
-      get: all[name],
-      enumerable: true,
-      configurable: true,
-      set: __exportSetter.bind(all, name)
-    });
-};
 // src/main.ts
 import { spawn } from "node:child_process";
 // package.json
 var package_default = {
   name: "@indexnetwork/cli",
-  version: "0.17.0",
+  version: "0.29.0",
   description: "Command-line interface for Index Network",
   license: "MIT",
   type: "module",
@@ -39,10 +25,10 @@ var package_default = {
     "publish:all": "bun scripts/publish.ts"
   },
   optionalDependencies: {
-    "@indexnetwork/cli-linux-x64": "0.17.0",
-    "@indexnetwork/cli-linux-arm64": "0.17.0",
-    "@indexnetwork/cli-darwin-x64": "0.17.0",
-    "@indexnetwork/cli-darwin-arm64": "0.17.0"
+    "@indexnetwork/cli-linux-x64": "0.29.0",
+    "@indexnetwork/cli-linux-arm64": "0.29.0",
+    "@indexnetwork/cli-darwin-x64": "0.29.0",
+    "@indexnetwork/cli-darwin-arm64": "0.29.0"
   },
   devDependencies: {
     "@types/bun": "1.3.14"
@@ -50,15 +36,15 @@ var package_default = {
 };
 // src/args.parser.ts
-var KNOWN_COMMANDS = new Set(["login", "logout", "profile", "intent", "opportunity", "negotiation", "network", "conversation", "contact", "scrape", "onboarding", "sync", "help", "version"]);
-var OPPORTUNITY_SUBCOMMANDS = new Set(["list", "show", "accept", "reject"]);
-var NEGOTIATION_SUBCOMMANDS = new Set(["list", "show"]);
-var NETWORK_SUBCOMMANDS = new Set(["list", "create", "show", "join", "leave", "invite", "update", "delete"]);
-var CONVERSATION_SUBCOMMANDS = new Set(["list", "with", "show", "send", "stream", "help"]);
+var KNOWN_COMMANDS = new Set(["docs", "agent", "login", "logout", "profile", "intent", "opportunity", "negotiation", "network", "conversation", "scrape", "onboarding", "sync", "help", "version"]);
+var OPPORTUNITY_SUBCOMMANDS = new Set(["list", "show", "accept", "reject", "start-chat"]);
+var NEGOTIATION_SUBCOMMANDS = new Set(["list", "show", "turn"]);
+var NETWORK_SUBCOMMANDS = new Set(["list", "create", "show", "join", "leave", "invite", "update", "delete", "discover", "requests", "request-update", "request-dismiss"]);
+var CONVERSATION_SUBCOMMANDS = new Set(["list", "with", "show", "send", "answer", "stream", "help"]);
 function parseArgs(args) {
   const result = {
     command: "help",
-    list: false
+    json: args.includes("--json")
   };
   if (args.length === 0) {
     return result;
@@ -67,6 +53,8 @@ function parseArgs(args) {
   for (let j = 0;j < args.length; j++) {
     const a = args[j];
     if (a === "--api-url" || a === "--app-url") {
+      if (!args[j + 1] || args[j + 1].startsWith("--"))
+        throw new Error(`Missing value for ${a}`);
       if (a === "--api-url")
         result.apiUrl = args[j + 1];
       else
@@ -78,7 +66,11 @@ function parseArgs(args) {
     } else if (a === "--version" || a === "-v") {
       result.command = "version";
       return result;
-    } else if (!a.startsWith("--")) {
+    } else if (a === "--json") {
+      continue;
+    } else if (a.startsWith("-")) {
+      throw new Error(`Unknown option: ${a}`);
+    } else {
       commandIndex = j;
       break;
     }
@@ -97,10 +89,66 @@ function parseArgs(args) {
   const positionals = [];
   while (i < args.length) {
     const arg = args[i];
-    if (arg === "--list" || arg === "-l") {
-      result.list = true;
-      i++;
-    } else if (arg === "--session" || arg === "-s") {
+    if (arg === "--help" || arg === "-h")
+      return { ...result, command: "help" };
+    if (arg === "--version" || arg === "-v")
+      return { ...result, command: "version" };
+    if (["--api-url", "--app-url", "--status", "--limit", "--prompt", "-p", "--objective", "--title"].includes(arg) && (!args[i + 1] || args[i + 1].startsWith("--")))
+      throw new Error(`Missing value for ${arg}`);
+    if (["--query", "--state", "--action", "--message", "--intent-id", "--question-id", "--expected-turn-count", "--receipt", "--name", "--intro", "--location", "--statuses", "--answer", "--social"].includes(arg)) {
+      const value = args[i + 1];
+      if (value === undefined || value.startsWith("--"))
+        throw new Error(`Missing value for ${arg}`);
+      switch (arg) {
+        case "--query":
+          result.query = value;
+          break;
+        case "--state":
+          result.state = value;
+          break;
+        case "--action":
+          result.action = value;
+          break;
+        case "--message":
+          result.message = value;
+          break;
+        case "--intent-id":
+          result.intentId = value;
+          break;
+        case "--question-id":
+          result.questionId = value;
+          break;
+        case "--expected-turn-count":
+          result.expectedTurnCount = Number(value);
+          break;
+        case "--receipt":
+          result.receipt = value;
+          break;
+        case "--name":
+          result.name = value;
+          break;
+        case "--intro":
+          result.intro = value;
+          break;
+        case "--location":
+          result.location = value;
+          break;
+        case "--statuses":
+          result.statuses = value;
+          break;
+        case "--answer":
+        case "--social": {
+          const at = value.indexOf("=");
+          if (at < 1 || !value.slice(at + 1).trim())
+            throw new Error(`${arg} needs key=value`);
+          const pair = { key: value.slice(0, at), value: value.slice(at + 1) };
+          if (arg === "--answer")
+            (result.answers ??= []).push(pair);
+          else
+            (result.socials ??= []).push({ label: pair.key, value: pair.value });
+          break;
+        }
+      }
       i += 2;
     } else if (arg === "--api-url") {
       result.apiUrl = args[i + 1];
@@ -115,7 +163,9 @@ function parseArgs(args) {
       result.status = args[i + 1];
       i += 2;
     } else if (arg === "--limit") {
-      result.limit = parseInt(args[i + 1], 10);
+      result.limit = Number(args[i + 1]);
+      if (!Number.isSafeInteger(result.limit) || result.limit < 1)
+        throw new Error("--limit must be a positive integer");
       i += 2;
     } else if (arg === "--prompt" || arg === "-p") {
       result.prompt = args[i + 1];
@@ -126,34 +176,45 @@ function parseArgs(args) {
     } else if (arg === "--objective") {
       result.objective = args[i + 1];
       i += 2;
-    } else if (arg === "--linkedin") {
-      result.linkedin = args[i + 1];
-      i += 2;
-    } else if (arg === "--github") {
-      result.github = args[i + 1];
-      i += 2;
-    } else if (arg === "--twitter") {
-      result.twitter = args[i + 1];
-      i += 2;
     } else if (arg === "--title") {
       result.title = args[i + 1];
       i += 2;
-    } else if (arg === "--details") {
-      result.details = args[i + 1];
-      i += 2;
-    } else if (arg === "--since") {
-      result.since = args[i + 1];
-      i += 2;
-    } else if (arg === "--acknowledge-uptake") {
-      result.acknowledgeUptake = (args[i + 1] ?? "").split(",").map((id) => id.trim()).filter(Boolean);
-      i += 2;
-    } else if (arg.startsWith("--")) {
-      i++;
+    } else if (arg.startsWith("-")) {
+      throw new Error(`Unknown option: ${arg}`);
     } else {
       positionals.push(arg);
       i++;
     }
   }
+  const subcommands = {
+    agent: new Set(["me"]),
+    opportunity: OPPORTUNITY_SUBCOMMANDS,
+    negotiation: NEGOTIATION_SUBCOMMANDS,
+    network: NETWORK_SUBCOMMANDS,
+    conversation: CONVERSATION_SUBCOMMANDS,
+    intent: INTENT_SUBCOMMANDS,
+    profile: new Set(["show", "sync", "update"]),
+    onboarding: new Set(["confirm-profile", "complete"])
+  };
+  const allowed = subcommands[result.command];
+  if (allowed && result.command !== "profile" && !positionals[0]) {
+    throw new Error(`Missing subcommand for index ${result.command}. Run index --help.`);
+  }
+  if (allowed && positionals[0] && !allowed.has(positionals[0])) {
+    throw new Error(`Unknown command: ${result.command} ${positionals[0]}`);
+  }
+  if (result.command === "agent") {
+    result.subcommand = positionals[0];
+    result.positionals = positionals.slice(1);
+    return result;
+  }
+  if (result.command === "login") {
+    if (positionals.length > 1 || positionals[0] && !["local", "dev", "prod"].includes(positionals[0])) {
+      throw new Error("Usage: index login [local|dev|prod] [--api-url <origin>] [--app-url <origin>]");
+    }
+    result.loginTarget = positionals[0];
+    return result;
+  }
   if (result.command === "opportunity") {
     const sub = positionals[0];
     if (sub && OPPORTUNITY_SUBCOMMANDS.has(sub)) {
@@ -168,6 +229,9 @@ function parseArgs(args) {
     return result;
   }
   if (result.command === "negotiation") {
+    if (result.limit !== undefined || result.status !== undefined) {
+      throw new Error("Negotiation filters are --intent-id and --state only");
+    }
     const sub = positionals[0];
     if (sub && NEGOTIATION_SUBCOMMANDS.has(sub)) {
       result.subcommand = sub;
@@ -198,20 +262,11 @@ function parseArgs(args) {
   }
   if (result.command === "onboarding" && positionals.length > 0) {
     const sub = positionals[0];
-    if (sub === "complete") {
-      result.subcommand = "complete";
-    }
-  }
-  if (result.command === "contact") {
-    if (positionals.length > 0) {
-      const sub = positionals[0];
-      if (["list", "add", "remove", "import"].includes(sub)) {
-        result.subcommand = sub;
-        result.positionals = positionals.slice(1);
-      }
+    if (sub === "complete" || sub === "confirm-profile") {
+      result.subcommand = sub;
     }
   }
-  if (result.command === "scrape") {
+  if (result.command === "scrape" || result.command === "docs") {
     result.positionals = positionals;
   }
   if (result.command === "intent") {
@@ -233,7 +288,7 @@ function parseArgs(args) {
   }
   return result;
 }
-var INTENT_SUBCOMMANDS = new Set(["list", "show", "create", "archive", "update", "link", "unlink"]);
+var INTENT_SUBCOMMANDS = new Set(["list", "show", "create", "prepare", "archive", "pause", "resume", "update", "networks", "add-to-network", "remove-from-network"]);
 function parseIntentArgs(positionals, result) {
   if (positionals.length === 0)
     return;
@@ -245,9 +300,13 @@ function parseIntentArgs(positionals, result) {
   switch (result.subcommand) {
     case "show":
     case "archive":
+    case "pause":
+    case "resume":
+    case "networks":
       result.intentId = rest[0];
       break;
     case "create":
+    case "prepare":
       if (rest.length > 0) {
         result.intentContent = rest.join(" ");
       }
@@ -258,8 +317,8 @@ function parseIntentArgs(positionals, result) {
         result.intentContent = rest.slice(1).join(" ");
       }
       break;
-    case "link":
-    case "unlink":
+    case "add-to-network":
+    case "remove-from-network":
       result.intentId = rest[0];
       result.targetId = rest[1];
       break;
@@ -283,7 +342,7 @@ class CredentialStore {
     try {
       const raw = await readFile(this.filePath, "utf-8");
       const parsed = JSON.parse(raw);
-      if (parsed.token && parsed.apiUrl && parsed.authKind === "api_key" && parsed.keyId) {
+      if (parsed.token && parsed.apiUrl && parsed.authKind === "session") {
         return parsed;
       }
       return null;
@@ -327,21 +386,16 @@ function isEarlyAccessNetworkCreationError(error) {
 }
 class ApiClient {
+  credentialKind;
   baseUrl;
   token;
-  constructor(baseUrl, token) {
+  constructor(baseUrl, token, credentialKind = "session") {
+    this.credentialKind = credentialKind;
     this.baseUrl = baseUrl.replace(/\/$/, "");
     this.token = token;
   }
   authHeaders() {
-    return { "x-api-key": this.token };
-  }
-  async revokeApiKey(keyId, targetKey = this.token) {
-    const res = await this.post("/api/auth/cli-credential/revoke", { keyId, targetKey });
-    const body = await res.json();
-    if (body.success !== true) {
-      throw new Error("API-key revocation was not confirmed");
-    }
+    return this.credentialKind === "apiKey" ? { "x-api-key": this.token } : { Authorization: `Bearer ${this.token}` };
   }
   async getMe() {
     const res = await this.get("/api/auth/me");
@@ -357,10 +411,13 @@ class ApiClient {
     const params = new URLSearchParams;
     if (opts?.status)
       params.set("status", opts.status);
+    if (opts?.statuses)
+      params.set("statuses", opts.statuses);
     if (opts?.limit)
       params.set("limit", String(opts.limit));
     const qs = params.toString();
-    const path = qs ? `/api/opportunities?${qs}` : "/api/opportunities";
+    const base = opts?.intentId ? `/api/intents/${encodeURIComponent(opts.intentId)}/opportunities` : "/api/opportunities";
+    const path = qs ? `${base}?${qs}` : base;
     const res = await this.get(path);
     const body = await res.json();
     return body.opportunities;
@@ -369,11 +426,12 @@ class ApiClient {
     const res = await this.get(`/api/opportunities/${id}`);
     return await res.json();
   }
-  async updateOpportunityStatus(id, status, acknowledgedUptakeQuestionIds) {
-    const res = await this.patch(`/api/opportunities/${id}/status`, {
-      status,
-      ...status === "accepted" && acknowledgedUptakeQuestionIds ? { acknowledgedUptakeQuestionIds } : {}
-    });
+  async updateOpportunityStatus(id, status) {
+    const res = await this.patch(`/api/opportunities/${encodeURIComponent(id)}/status`, { status });
+    return await res.json();
+  }
+  async startOpportunityChat(id) {
+    const res = await this.post(`/api/opportunities/${encodeURIComponent(id)}/start-chat`, {});
     return await res.json();
   }
   async listIntents(options = {}) {
@@ -386,6 +444,8 @@ class ApiClient {
       body.sourceType = options.sourceType;
     if (options.page !== undefined)
       body.page = options.page;
+    if (options.query !== undefined)
+      body.q = options.query;
     const res = await this.post("/api/intents/list", body);
     return await res.json();
   }
@@ -394,17 +454,38 @@ class ApiClient {
     const body = await res.json();
     return body.intent;
   }
-  async confirmIntent(proposalId, description, networkId) {
-    const res = await this.post("/api/intents/confirm", {
-      proposalId,
+  async createIntent(description, networkIds, preparationReceipt) {
+    const res = await this.post("/api/intents", {
       description,
-      ...networkId ? { networkId } : {}
+      ...networkIds?.length ? { networkIds } : {},
+      ...preparationReceipt ? { preparationReceipt } : {}
     });
-    const body = await res.json();
-    return body;
+    return await res.json();
+  }
+  async prepareIntent(payload, answers = []) {
+    const res = await this.post("/api/intents/prepare", { payload, answers });
+    return await res.json();
+  }
+  async updateIntentStatus(id, status) {
+    await this.patch(`/api/intents/${encodeURIComponent(id)}/status`, { status });
   }
   async updateIntent(intentId, description) {
-    return this.callTool("update_intent", { intentId, description });
+    const res = await this.patch(`/api/intents/${encodeURIComponent(intentId)}`, { description });
+    return await res.json();
+  }
+  async archiveIntent(intentId) {
+    await this.patch(`/api/intents/${encodeURIComponent(intentId)}/archive`);
+  }
+  async listIntentNetworks(intentId) {
+    const res = await this.get(`/api/intents/${encodeURIComponent(intentId)}/networks`);
+    const body = await res.json();
+    return body.networkIds;
+  }
+  async addIntentToNetwork(intentId, networkId) {
+    await this.post(`/api/intents/${encodeURIComponent(intentId)}/networks`, { networkId });
+  }
+  async removeIntentFromNetwork(intentId, networkId) {
+    await this.del(`/api/intents/${encodeURIComponent(intentId)}/networks/${encodeURIComponent(networkId)}`);
   }
   async listNetworks() {
     const res = await this.get("/api/networks");
@@ -414,14 +495,26 @@ class ApiClient {
       joinPolicy: n.joinPolicy ?? n.permissions?.joinPolicy
     }));
   }
+  async discoverNetworks() {
+    return await (await this.get("/api/networks/discovery/public?page=1&limit=50")).json();
+  }
+  async listNetworkRequests() {
+    return await (await this.get("/api/network-requests")).json();
+  }
+  async updateNetworkRequest(id, name, purpose) {
+    return await (await this.patch(`/api/network-requests/${encodeURIComponent(id)}`, { name, ...purpose ? { purpose } : {} })).json();
+  }
+  async dismissNetworkRequest(id) {
+    await this.del(`/api/network-requests/${encodeURIComponent(id)}`);
+  }
   async createNetworkOrRequest(title, prompt) {
     try {
-      const res2 = await this.post("/api/networks", {
+      const res = await this.post("/api/networks", {
         title,
         ...prompt ? { prompt } : {}
       });
-      const body2 = await res2.json();
-      return { kind: "created", network: body2.network };
+      const body = await res.json();
+      return { kind: "created", network: body.network };
     } catch (error) {
       if (!isEarlyAccessNetworkCreationError(error))
         throw error;
@@ -452,6 +545,14 @@ class ApiClient {
   async leaveNetwork(id) {
     await this.post(`/api/networks/${id}/leave`, {});
   }
+  async updateNetwork(id, settings) {
+    const res = await this.put(`/api/networks/${id}`, settings);
+    const body = await res.json();
+    return body.network;
+  }
+  async deleteNetwork(id) {
+    await this.del(`/api/networks/${id}`);
+  }
   async inviteNetworkMember(networkId, email, name) {
     const res = await this.post(`/api/networks/${networkId}/members/invite`, {
       email,
@@ -481,18 +582,23 @@ class ApiClient {
     const body = await res.json();
     return body.messages;
   }
-  async sendMessage(conversationId, text) {
+  async sendMessage(conversationId, text, intentId, questionId) {
     const res = await this.post(`/api/conversations/${conversationId}/messages`, {
-      parts: [{ type: "text", text }]
+      parts: [{ kind: "text", text }],
+      ...intentId ? { metadata: { intentId } } : {},
+      ...questionId ? { questionId } : {}
     });
     const body = await res.json();
     return body.message;
   }
+  async answerAgentQuestions(intentId, answers) {
+    return await (await this.post("/api/conversations/agent/answers", { intentId, answers })).json();
+  }
   async hideConversation(conversationId) {
     await this.del(`/api/conversations/${conversationId}`);
   }
-  async streamConversationEvents() {
-    const res = await fetch(`${this.baseUrl}/api/conversations/stream`, {
+  async streamEvents() {
+    const res = await fetch(`${this.baseUrl}/api/events`, {
       headers: {
         ...this.authHeaders(),
         Accept: "text/event-stream"
@@ -504,16 +610,13 @@ class ApiClient {
     return res;
   }
   async listNegotiations(opts) {
-    const me = await this.getMe();
     const params = new URLSearchParams;
-    if (opts?.limit)
-      params.set("limit", String(opts.limit));
-    if (opts?.offset)
-      params.set("offset", String(opts.offset));
-    if (opts?.since)
-      params.set("since", opts.since);
+    if (opts?.intentId)
+      params.set("intentId", opts.intentId);
+    if (opts?.state)
+      params.set("state", opts.state);
     const qs = params.toString();
-    const path = qs ? `/api/users/${me.id}/negotiations?${qs}` : `/api/users/${me.id}/negotiations`;
+    const path = `/api/negotiations${qs ? `?${qs}` : ""}`;
     const res = await this.get(path);
     const body = await res.json();
     return body.negotiations;
@@ -522,18 +625,37 @@ class ApiClient {
     const res = await this.post("/api/enrichment/enrich", {});
     return await res.json();
   }
-  async readUserContexts(query = {}) {
-    return this.callTool("read_user_contexts", query);
+  async updateProfile(fields) {
+    const body = await (await this.patch("/api/auth/profile/update", fields)).json();
+    return body.user;
+  }
+  async scrapeUrl(url, objective) {
+    const res = await this.post("/api/scrape", { url, ...objective ? { objective } : {} });
+    return await res.json();
+  }
+  async readDocs(topic) {
+    const path = topic ? `/api/docs?${new URLSearchParams({ topic })}` : "/api/docs";
+    return (await this.get(path)).json();
   }
-  async createUserContext(query) {
-    return this.callTool("create_user_context", query);
+  async getAgent() {
+    return await (await this.get("/api/agents/me")).json();
   }
-  async updateUserContext(query) {
-    return this.callTool("update_user_context", query);
+  async getNegotiation(opportunityId) {
+    const body = await (await this.get(`/api/opportunities/${encodeURIComponent(opportunityId)}/negotiation`)).json();
+    return body.negotiation;
   }
-  async callTool(toolName, query = {}) {
-    const res = await this.post(`/api/tools/${toolName}`, { query });
-    return await res.json();
+  async submitNegotiationTurn(opportunityId, turn) {
+    const body = await (await this.post(`/api/opportunities/${encodeURIComponent(opportunityId)}/negotiation/turns`, turn)).json();
+    return body.negotiation;
+  }
+  async getAgentConversation(intentId) {
+    return await (await this.get(`/api/conversations/agent/messages?${new URLSearchParams({ intentId })}`)).json();
+  }
+  async confirmProfile() {
+    return await (await this.post("/api/auth/onboarding/confirm-profile", {})).json();
+  }
+  async completeOnboarding(intentId) {
+    return await (await this.post("/api/auth/onboarding/complete", { intentId })).json();
   }
   async get(path) {
     const res = await fetch(`${this.baseUrl}${path}`, {
@@ -558,6 +680,19 @@ class ApiClient {
     }
     return res;
   }
+  async put(path, body) {
+    const res = await fetch(`${this.baseUrl}${path}`, {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json",
+        ...this.authHeaders()
+      },
+      ...body !== undefined ? { body: JSON.stringify(body) } : {}
+    });
+    if (!res.ok)
+      await this.handleError(res);
+    return res;
+  }
   async patch(path, body) {
     const res = await fetch(`${this.baseUrl}${path}`, {
       method: "PATCH",
@@ -582,9 +717,6 @@ class ApiClient {
     return res;
   }
   async handleError(res) {
-    if (res.status === 401) {
-      throw new ApiError("Session expired or invalid. Run `index login` to re-authenticate.", res.status);
-    }
     let message = `HTTP ${res.status}`;
     let response;
     try {
@@ -603,23 +735,33 @@ class ApiClient {
 import { randomBytes } from "node:crypto";
 import { createServer } from "node:http";
-// src/auth.lifecycle.ts
-async function storeReplacementCredentials(store, previous, replacement, options = {}) {
-  await store.save(replacement);
-  if (!previous)
-    return {};
-  if (replacement.keyId === previous.keyId) {
-    return {};
-  }
-  const createClient = options.clientFactory ?? ((apiUrl, token) => new ApiClient(apiUrl, token));
+// src/auth.session.ts
+var DEVICE_CLIENT_ID = "index-device";
+async function redeemDeviceCode(baseUrl, deviceCode) {
+  const response = await fetch(`${baseUrl}/api/auth/device/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", "User-Agent": "index-cli" },
+    body: JSON.stringify({
+      grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+      device_code: deviceCode,
+      client_id: DEVICE_CLIENT_ID
+    })
+  });
+  const body = await response.json().catch(() => null);
+  if (!response.ok || !body?.access_token) {
+    throw new Error(body?.error_description ?? "Could not complete device sign-in.");
+  }
+  return body.access_token;
+}
+async function revokeSession(baseUrl, token) {
   try {
-    await createClient(replacement.apiUrl, replacement.token).revokeApiKey(previous.keyId, previous.token);
-    return {};
-  } catch (error) {
-    const detail = error instanceof Error ? ` ${error.message}` : "";
-    return {
-      warning: `Login succeeded, but the previous CLI API key remains active because it could not be revoked.${detail} It should be removed in Index web settings.`
-    };
+    const response = await fetch(`${baseUrl}/api/auth/sign-out`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${token}` }
+    });
+    return response.ok;
+  } catch {
+    return false;
   }
 }
@@ -676,33 +818,28 @@ async function handleLogin(apiUrl, appUrl, store, options = {}) {
       return;
     }
     stateConsumed = true;
-    const apiKey = url.searchParams.get("api_key");
-    const keyId = url.searchParams.get("key_id");
-    if (apiKey && keyId) {
+    const deviceCode = url.searchParams.get("device_code");
+    if (deviceCode) {
       try {
-        const cleanup = await storeReplacementCredentials(store, previousCredentials, {
-          token: apiKey,
-          apiUrl: baseUrl,
-          authKind: "api_key",
-          keyId
-        }, { clientFactory: options.credentialClientFactory });
-        resolveCallback({ success: true, ...cleanup });
-      } catch {
-        resolveCallback({ success: false, error: "Failed to save CLI credentials." });
+        const token = await redeemDeviceCode(baseUrl, deviceCode);
+        await store.save({ token, apiUrl: baseUrl, authKind: "session" });
+        if (previousCredentials)
+          await revokeSession(previousCredentials.apiUrl, previousCredentials.token);
+        resolveCallback({ success: true });
+      } catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to save CLI credentials.";
+        resolveCallback({ success: false, error: message });
         res.writeHead(500, { "Content-Type": "text/html" });
-        res.end(callbackHtml("Authorization failed", "CLI credentials could not be saved. Return to the terminal and try again."));
+        res.end(callbackHtml("Authorization failed", "CLI sign-in could not be completed. Return to the terminal and try again."));
         return;
       }
       res.writeHead(200, { "Content-Type": "text/html" });
-      res.end(callbackHtml("CLI authorized", "You can close this window and return to the terminal.", true));
+      res.end(callbackHtml("Authentication complete", "You can close this window and return to the terminal.", true));
       return;
     }
-    resolveCallback({
-      success: false,
-      error: apiKey ? "CLI API-key callback did not include its key ID." : "No CLI credential received in callback."
-    });
+    resolveCallback({ success: false, error: "No device code received in callback." });
     res.writeHead(400, { "Content-Type": "text/html" });
-    res.end(callbackHtml("Authorization failed", "Incomplete CLI credentials received. Please try again."));
+    res.end(callbackHtml("Authorization failed", "Incomplete sign-in received. Please try again."));
   });
   let listenSettled = false;
   let rejectListen = null;
@@ -813,168 +950,64 @@ p{font-size:14px;font-weight:500;margin:0;color:rgba(244,251,246,0.78)}
 }
 // src/logout.command.ts
-async function handleLogout(store, options = {}) {
+async function handleLogout(store) {
   const credentials = await store.load();
   if (!credentials) {
     return { success: true, message: "Already logged out." };
   }
-  const createClient = options.clientFactory ?? ((apiUrl, token) => new ApiClient(apiUrl, token));
-  try {
-    await createClient(credentials.apiUrl, credentials.token).revokeApiKey(credentials.keyId, credentials.token);
-  } catch (error) {
-    const detail = error instanceof Error ? ` ${error.message}` : "";
-    return {
-      success: false,
-      warning: `Logout could not revoke the stored CLI API key, so credentials were retained.${detail}`
-    };
-  }
+  const revoked = await revokeSession(credentials.apiUrl, credentials.token);
   try {
     await store.clear();
   } catch {
     return {
       success: false,
-      warning: "The server API key was revoked, but local credential cleanup failed. Remove the local credentials file manually before signing in again."
+      warning: "Local credential cleanup failed. Remove the local credentials file manually before signing in again."
     };
   }
-  return { success: true, message: "Logged out. CLI API key revoked." };
+  return {
+    success: true,
+    message: revoked ? "Logged out." : "Logged out locally. The session could not be reached — revoke it in Index web settings if this machine is not yours."
+  };
 }
-// src/output/index.ts
-var exports_output = {};
-__export(exports_output, {
-  wordWrap: () => wordWrap,
-  warn: () => warn,
-  toolActivity: () => toolActivity,
-  success: () => success,
-  stripAnsi: () => stripAnsi,
-  status: () => status,
-  raw: () => raw,
-  profileCard: () => profileCard,
-  padTo: () => padTo,
-  opportunityTable: () => opportunityTable,
-  opportunityCard: () => opportunityCard,
-  networkTable: () => networkTable,
-  networkCard: () => networkCard,
-  messageList: () => messageList,
-  memberTable: () => memberTable,
-  intentTable: () => intentTable,
-  intentCard: () => intentCard,
-  info: () => info,
-  humanizeToolName: () => humanizeToolName,
-  heading: () => heading,
-  error: () => error,
-  dim: () => dim,
-  conversationTable: () => conversationTable,
-  conversationCard: () => conversationCard,
-  contactTable: () => contactTable,
-  confidenceBar: () => confidenceBar,
-  clearStatus: () => clearStatus,
-  chatHeader: () => chatHeader,
-  YELLOW: () => YELLOW,
-  WHITE: () => WHITE,
-  USER_PROMPT: () => USER_PROMPT,
-  RESET: () => RESET,
-  RED: () => RED,
-  PROMPT_STR: () => PROMPT_STR,
-  ORANGE: () => ORANGE,
-  MarkdownRenderer: () => MarkdownRenderer,
-  MAGENTA: () => MAGENTA,
-  ITALIC: () => ITALIC,
-  GREEN: () => GREEN,
-  GRAY: () => GRAY,
-  DIM: () => DIM,
-  CYAN: () => CYAN,
-  BOLD: () => BOLD,
-  BLUE: () => BLUE,
-  AGENT_TEXT: () => AGENT_TEXT
-});
 // src/output/base.ts
 var RESET = "\x1B[0m";
 var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
-var ITALIC = "\x1B[3m";
 var RED = "\x1B[31m";
 var GREEN = "\x1B[32m";
 var YELLOW = "\x1B[33m";
 var BLUE = "\x1B[34m";
-var MAGENTA = "\x1B[35m";
 var CYAN = "\x1B[36m";
 var WHITE = "\x1B[37m";
 var GRAY = "\x1B[90m";
-var ORANGE = "\x1B[38;5;208m";
 var AGENT_TEXT = "\x1B[38;5;252m";
 var USER_PROMPT = CYAN;
 function error(message, exitCode) {
+  if (process.argv.includes("--json"))
+    throw new Error(message);
   console.error(`${RED}${BOLD}error${RESET}${RED}: ${message}${RESET}`);
-  if (exitCode !== undefined) {
+  process.exitCode = exitCode ?? 1;
+  if (exitCode !== undefined)
     process.exit(exitCode);
-  }
 }
 function success(message) {
   console.log(`${GREEN}${BOLD}+${RESET} ${message}`);
 }
 function info(message) {
-  console.log(`${CYAN}${message}${RESET}`);
+  console.error(`${CYAN}${message}${RESET}`);
 }
 function warn(message) {
   console.warn(`${YELLOW}${message}${RESET}`);
 }
 function dim(message) {
-  console.log(`${GRAY}${message}${RESET}`);
+  console.error(`${GRAY}${message}${RESET}`);
 }
 function heading(message) {
   console.log(`
 ${BOLD}${message}${RESET}`);
 }
-function chatHeader() {
-  console.log();
-  console.log(`  ${BOLD}${CYAN}I N D E X${RESET}  ${GRAY}chat${RESET}`);
-  console.log(`  ${GRAY}─────────────────────────────────────${RESET}`);
-  console.log(`  ${GRAY}Type your message. "exit" or Ctrl+C to quit.${RESET}`);
-  console.log();
-}
 var PROMPT_STR = `${USER_PROMPT}${BOLD}> ${RESET}`;
-function raw(text) {
-  process.stdout.write(text);
-}
-function status(message) {
-  process.stderr.write(`\r  ${GRAY}${message}${RESET}\x1B[K`);
-}
-function clearStatus() {
-  process.stderr.write("\r\x1B[K");
-}
-function toolActivity(description) {
-  process.stderr.write(`\r\x1B[K${ORANGE}> ${description}${RESET}
-`);
-}
-var TOOL_DESCRIPTIONS = {
-  read_user_contexts: "Reading your profile...",
-  create_user_context: "Creating your profile...",
-  update_user_context: "Updating your profile...",
-  read_intents: "Fetching your active signals...",
-  create_intent: "Creating a new signal...",
-  update_intent: "Updating signal...",
-  delete_intent: "Removing signal...",
-  create_intent_index: "Saving signal to index...",
-  read_intent_indexes: "Fetching signals in index...",
-  delete_intent_index: "Removing signal from index...",
-  read_networks: "Checking your communities...",
-  create_network: "Creating a new community...",
-  update_network: "Updating community...",
-  delete_network: "Deleting community...",
-  create_network_membership: "Adding member to community...",
-  read_network_memberships: "Fetching community memberships...",
-  list_opportunities: "Listing your opportunities...",
-  update_opportunity: "Updating opportunity status...",
-  scrape_url: "Reading content from URL...",
-  read_docs: "Looking up documentation...",
-  list_contacts: "Listing your contacts...",
-  remove_contact: "Removing contact..."
-};
-function humanizeToolName(name) {
-  return TOOL_DESCRIPTIONS[name] ?? name.replace(/_/g, " ") + "...";
-}
 function wordWrap(text, maxWidth) {
   const lines = [];
   const words = text.split(/\s+/);
@@ -1005,220 +1038,6 @@ function padTo(cellWidth, plainText) {
 function stripAnsi(str) {
   return str.replace(/\x1b\[[0-9;]*m/g, "");
 }
-// src/output/markdown.ts
-class MarkdownRenderer {
-  buffer = "";
-  inCodeBlock = false;
-  codeBlockLang = "";
-  codeBlockContent = "";
-  pristine = true;
-  write(text) {
-    this.buffer += text;
-    this.flush();
-  }
-  flush() {
-    while (this.buffer.length > 0) {
-      if (this.inCodeBlock) {
-        const endIdx = this.buffer.indexOf("```");
-        if (endIdx !== -1) {
-          this.codeBlockContent += this.buffer.slice(0, endIdx);
-          this.buffer = this.buffer.slice(endIdx + 3);
-          if (this.buffer.startsWith(`
-`)) {
-            this.buffer = this.buffer.slice(1);
-          }
-          this.renderCodeBlock();
-          this.inCodeBlock = false;
-          this.codeBlockLang = "";
-          this.codeBlockContent = "";
-          continue;
-        }
-        this.codeBlockContent += this.buffer;
-        this.buffer = "";
-        return;
-      }
-      const codeBlockMatch = this.buffer.match(/^```([^\n]*)\n/);
-      if (codeBlockMatch) {
-        this.codeBlockLang = codeBlockMatch[1].trim();
-        this.buffer = this.buffer.slice(codeBlockMatch[0].length);
-        this.inCodeBlock = true;
-        this.codeBlockContent = "";
-        continue;
-      }
-      if (this.buffer.startsWith("```")) {
-        return;
-      }
-      const nlIdx = this.buffer.indexOf(`
-`);
-      if (nlIdx === -1) {
-        return;
-      }
-      const line = this.buffer.slice(0, nlIdx);
-      this.buffer = this.buffer.slice(nlIdx + 1);
-      this.emitLine(line);
-    }
-  }
-  emitLine(line) {
-    if (this.pristine) {
-      process.stdout.write(`
-`);
-      this.pristine = false;
-    }
-    const rendered = this.renderLine(line);
-    process.stdout.write(rendered + `
-`);
-  }
-  renderLine(line) {
-    const bulletMatch = line.match(/^(\s*)([-*])\s+(.*)$/);
-    if (bulletMatch) {
-      const [, indent, , content] = bulletMatch;
-      return `${indent}  ${CYAN}*${RESET} ${this.renderInline(content)}`;
-    }
-    const numMatch = line.match(/^(\s*)(\d+)\.\s+(.*)$/);
-    if (numMatch) {
-      const [, indent, num, content] = numMatch;
-      return `${indent}  ${CYAN}${num}.${RESET} ${this.renderInline(content)}`;
-    }
-    if (line.startsWith("### ")) {
-      return `${BOLD}${WHITE}${line.slice(4)}${RESET}`;
-    }
-    if (line.startsWith("## ")) {
-      return `${BOLD}${WHITE}${line.slice(3)}${RESET}`;
-    }
-    if (line.startsWith("# ")) {
-      return `${BOLD}${WHITE}${line.slice(2)}${RESET}`;
-    }
-    return this.renderInline(line);
-  }
-  renderInline(text) {
-    text = text.replace(/\*\*\*(.+?)\*\*\*/g, `${BOLD}${ITALIC}${WHITE}$1${RESET}${AGENT_TEXT}`);
-    text = text.replace(/\*\*(.+?)\*\*/g, `${BOLD}${WHITE}$1${RESET}${AGENT_TEXT}`);
-    text = text.replace(/(?<!\*)\*([^*]+?)\*(?!\*)/g, `${ITALIC}$1${RESET}${AGENT_TEXT}`);
-    text = text.replace(/`([^`]+)`/g, `${CYAN}$1${RESET}${AGENT_TEXT}`);
-    return `${AGENT_TEXT}${text}${RESET}`;
-  }
-  renderCodeBlock() {
-    const lang = this.codeBlockLang;
-    const content = this.codeBlockContent.trimEnd();
-    if (!this.pristine) {
-      process.stdout.write(`
-`);
-    }
-    this.pristine = false;
-    if (lang === "intent_proposal") {
-      this.renderIntentProposal(content);
-      return;
-    }
-    if (lang === "opportunity") {
-      this.renderOpportunity(content);
-      return;
-    }
-    const border = `${GRAY}|${RESET}`;
-    if (lang) {
-      process.stdout.write(`  ${GRAY}--- ${lang} ${"─".repeat(Math.max(0, 40 - lang.length))}${RESET}
-`);
-    } else {
-      process.stdout.write(`  ${GRAY}${"─".repeat(46)}${RESET}
-`);
-    }
-    for (const line of content.split(`
-`)) {
-      process.stdout.write(`  ${border} ${CYAN}${line}${RESET}
-`);
-    }
-    process.stdout.write(`  ${GRAY}${"─".repeat(46)}${RESET}
-`);
-  }
-  renderIntentProposal(content) {
-    try {
-      const data = JSON.parse(content);
-      const desc = data.description ?? content;
-      const confidence = data.confidence;
-      process.stdout.write(`  ${MAGENTA}+${"─".repeat(56)}+${RESET}
-`);
-      process.stdout.write(`  ${MAGENTA}|${RESET} ${BOLD}${MAGENTA}Signal Proposal${RESET}${" ".repeat(40)}${MAGENTA}|${RESET}
-`);
-      process.stdout.write(`  ${MAGENTA}|${RESET}${" ".repeat(56)}${MAGENTA}|${RESET}
-`);
-      const wrapped = wordWrap(desc, 52);
-      for (const line of wrapped) {
-        const pad = Math.max(0, 54 - line.length);
-        process.stdout.write(`  ${MAGENTA}|${RESET}  ${AGENT_TEXT}${line}${RESET}${" ".repeat(pad)}${MAGENTA}|${RESET}
-`);
-      }
-      if (confidence !== undefined) {
-        process.stdout.write(`  ${MAGENTA}|${RESET}${" ".repeat(56)}${MAGENTA}|${RESET}
-`);
-        const bar = confidenceBar(confidence);
-        process.stdout.write(`  ${MAGENTA}|${RESET}  ${GRAY}Confidence: ${bar}${RESET}${" ".repeat(24)}${MAGENTA}|${RESET}
-`);
-      }
-      process.stdout.write(`  ${MAGENTA}+${"─".repeat(56)}+${RESET}
-`);
-    } catch {
-      process.stdout.write(`  ${GRAY}${content}${RESET}
-`);
-    }
-  }
-  renderOpportunity(content) {
-    try {
-      const data = JSON.parse(content);
-      process.stdout.write(`  ${BLUE}+${"─".repeat(56)}+${RESET}
-`);
-      process.stdout.write(`  ${BLUE}|${RESET} ${BOLD}${BLUE}Opportunity${RESET}${" ".repeat(44)}${BLUE}|${RESET}
-`);
-      if (data.title) {
-        const pad = Math.max(0, 54 - data.title.length);
-        process.stdout.write(`  ${BLUE}|${RESET}  ${BOLD}${data.title}${RESET}${" ".repeat(pad)}${BLUE}|${RESET}
-`);
-      }
-      if (data.description) {
-        process.stdout.write(`  ${BLUE}|${RESET}${" ".repeat(56)}${BLUE}|${RESET}
-`);
-        const wrapped = wordWrap(data.description, 52);
-        for (const line of wrapped) {
-          const pad = Math.max(0, 54 - line.length);
-          process.stdout.write(`  ${BLUE}|${RESET}  ${AGENT_TEXT}${line}${RESET}${" ".repeat(pad)}${BLUE}|${RESET}
-`);
-        }
-      }
-      process.stdout.write(`  ${BLUE}+${"─".repeat(56)}+${RESET}
-`);
-    } catch {
-      process.stdout.write(`  ${GRAY}${content}${RESET}
-`);
-    }
-  }
-  reset(reason) {
-    if (this.buffer.length > 0 || this.inCodeBlock) {
-      this.buffer = "";
-      this.inCodeBlock = false;
-      this.codeBlockContent = "";
-      this.codeBlockLang = "";
-    }
-    if (!this.pristine) {
-      process.stdout.write(`
-${GRAY}--- retrying${reason ? `: ${reason}` : ""} ---${RESET}
-`);
-    }
-    this.pristine = true;
-  }
-  finalize() {
-    if (this.inCodeBlock) {
-      this.renderCodeBlock();
-      this.inCodeBlock = false;
-    }
-    if (this.buffer.length > 0) {
-      this.emitLine(this.buffer);
-      this.buffer = "";
-    }
-  }
-}
 // src/output/formatters.ts
 function profileCard(data) {
   const lines = [];
@@ -1264,21 +1083,9 @@ function profileCard(data) {
   console.log(output);
   return output;
 }
-function contactTable(contacts) {
-  if (contacts.length === 0) {
-    console.log("  No contacts yet.");
-    return;
-  }
-  const nameWidth = Math.max(6, ...contacts.map((c) => c.name.length));
-  const header = `  ${"Name".padEnd(nameWidth)}  Email`;
-  console.log(`${BOLD}${header}${RESET}`);
-  for (const c of contacts) {
-    console.log(`  ${c.name.padEnd(nameWidth)}  ${c.email}`);
-  }
-}
 function intentTable(intents) {
   if (intents.length === 0) {
-    dim("  No signals found.");
+    dim("  No intents found.");
     return;
   }
   const idWidth = 8;
@@ -1286,12 +1093,12 @@ function intentTable(intents) {
   const statusWidth = 10;
   const sourceWidth = 16;
   const dateWidth = 20;
-  console.log(`  ${BOLD}${"ID".padEnd(idWidth)}  ${"Signal".padEnd(descWidth)}  ${"Status".padEnd(statusWidth)}  ${"Source".padEnd(sourceWidth)}  ${"Created".padEnd(dateWidth)}${RESET}`);
+  console.log(`  ${BOLD}${"ID".padEnd(idWidth)}  ${"Intent".padEnd(descWidth)}  ${"Status".padEnd(statusWidth)}  ${"Source".padEnd(sourceWidth)}  ${"Created".padEnd(dateWidth)}${RESET}`);
   console.log(`  ${GRAY}${"-".repeat(idWidth)}  ${"-".repeat(descWidth)}  ${"-".repeat(statusWidth)}  ${"-".repeat(sourceWidth)}  ${"-".repeat(dateWidth)}${RESET}`);
   for (const intent of intents) {
     const shortId = intent.id.slice(0, 8);
     const desc = (intent.summary ?? intent.payload).slice(0, descWidth);
-    const status2 = (intent.status ?? "").padEnd(statusWidth);
+    const status = (intent.status ?? "").padEnd(statusWidth);
     const source = (intent.sourceType ?? "-").padEnd(sourceWidth);
     const date = new Date(intent.createdAt).toLocaleDateString("en-US", {
       year: "numeric",
@@ -1299,12 +1106,48 @@ function intentTable(intents) {
       day: "numeric"
     });
     const sColor = intent.status === "ACTIVE" ? GREEN : GRAY;
-    console.log(`  ${CYAN}${shortId}${RESET}  ${desc.padEnd(descWidth)}  ${sColor}${status2}${RESET}  ${GRAY}${source}${RESET}  ${GRAY}${date}${RESET}`);
+    console.log(`  ${CYAN}${shortId}${RESET}  ${desc.padEnd(descWidth)}  ${sColor}${status}${RESET}  ${GRAY}${source}${RESET}  ${GRAY}${date}${RESET}`);
   }
 }
+function intentPreparation(prepared) {
+  if (prepared.status === "ready") {
+    success("Intent is ready to create.");
+    console.log();
+    for (const line of wordWrap(prepared.payload, 72))
+      console.log(`  ${line}`);
+    console.log();
+    console.log(`  ${BOLD}Create it:${RESET}`);
+    console.log(`  index intent create ${shellQuote(prepared.payload)} --receipt ${shellQuote(prepared.preparationReceipt)}`);
+    console.log();
+    return;
+  }
+  console.log();
+  console.log(`  ${BOLD}${YELLOW}Needs revision${RESET}`);
+  for (const line of wordWrap(prepared.feedback, 72))
+    console.log(`  ${line}`);
+  console.log();
+  console.log(`  ${BOLD}Answer these:${RESET}`);
+  for (const field of prepared.recovery) {
+    console.log(`  ${CYAN}*${RESET} ${field.label}`);
+    for (const option of field.options ?? []) {
+      const description = option.description ? `${GRAY} — ${option.description}${RESET}` : "";
+      console.log(`      ${option.label}${description}`);
+    }
+    if (field.placeholder)
+      console.log(`      ${GRAY}${field.placeholder}${RESET}`);
+  }
+  console.log();
+  const answerFlags = prepared.recovery.map((field) => `--answer ${shellQuote(`${field.label}=<reply>`)}`);
+  console.log(`  ${BOLD}Then run:${RESET}`);
+  console.log(`  index intent prepare ${shellQuote(prepared.payload)} ${answerFlags.join(" ")}`);
+  console.log();
+}
+function shellQuote(value) {
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
 function intentCard(intent) {
   console.log();
-  console.log(`  ${BOLD}${CYAN}Signal Details${RESET}`);
+  console.log(`  ${BOLD}${CYAN}Intent Details${RESET}`);
   console.log(`  ${GRAY}${"─".repeat(50)}${RESET}`);
   console.log(`  ${BOLD}ID${RESET}            ${GRAY}${intent.id}${RESET}`);
   console.log(`  ${BOLD}Status${RESET}        ${intent.status === "ACTIVE" ? GREEN : GRAY}${intent.status}${RESET}`);
@@ -1339,10 +1182,10 @@ function intentCard(intent) {
   if (intent.archivedAt) {
     console.log(`  ${BOLD}Archived${RESET}      ${GRAY}${new Date(intent.archivedAt).toLocaleString()}${RESET}`);
   }
-  if (intent.indexes && intent.indexes.length > 0) {
+  if (intent.networks && intent.networks.length > 0) {
     console.log();
-    console.log(`  ${BOLD}Index Assignments${RESET}`);
-    for (const idx of intent.indexes) {
+    console.log(`  ${BOLD}Networks${RESET}`);
+    for (const idx of intent.networks) {
       const score = idx.relevancyScore !== undefined ? ` (${idx.relevancyScore.toFixed(2)})` : "";
       console.log(`  ${CYAN}*${RESET} ${idx.title}${GRAY}${score}${RESET}`);
     }
@@ -1368,35 +1211,25 @@ function opportunityTable(opportunities) {
   }
   const idW = 8;
   const nameW = 20;
-  const catW = 18;
-  const statusW = 10;
-  const confW = 8;
-  const dateW = 20;
-  process.stdout.write(`  ${BOLD}${"ID".padEnd(idW)}  ${"Counterparty".padEnd(nameW)}  ${"Category".padEnd(catW)}  ${"Status".padEnd(statusW)}  ${"Conf".padEnd(confW)}  ${"Created".padEnd(dateW)}${RESET}
+  const statusW = 12;
+  const headlineW = 48;
+  process.stdout.write(`  ${BOLD}${"ID".padEnd(idW)}  ${"Counterparty".padEnd(nameW)}  ${"Status".padEnd(statusW)}  Headline${RESET}
 `);
-  process.stdout.write(`  ${GRAY}${"-".repeat(idW)}  ${"-".repeat(nameW)}  ${"-".repeat(catW)}  ${"-".repeat(statusW)}  ${"-".repeat(confW)}  ${"-".repeat(dateW)}${RESET}
+  process.stdout.write(`  ${GRAY}${"-".repeat(idW)}  ${"-".repeat(nameW)}  ${"-".repeat(statusW)}  ${"-".repeat(headlineW)}${RESET}
 `);
   for (const opp of opportunities) {
-    const shortId = opp.id.slice(0, 8);
-    const fallbackName = opp.actors?.[1]?.name ?? opp.actors?.find((a) => a.name)?.name;
-    const name = (opp.counterpartName ?? fallbackName ?? "Unknown").slice(0, nameW);
-    const category = (opp.interpretation?.category ?? "-").slice(0, catW);
+    const shortId = opp.opportunityId.slice(0, idW);
+    const name = opp.peer.name.slice(0, nameW);
     const st = opp.status.slice(0, statusW);
-    const rawConf = opp.interpretation?.confidence;
-    const conf = rawConf != null ? `${Math.round(rawConf <= 1 ? rawConf * 100 : rawConf)}%` : "-";
-    const date = opp.createdAt ? new Date(opp.createdAt).toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric"
-    }) : "-";
-    process.stdout.write(`  ${CYAN}${shortId}${RESET}  ${name.padEnd(nameW)}  ${GRAY}${category.padEnd(catW)}${RESET}  ${statusColor(st)}${st.padEnd(statusW)}${RESET}  ${GRAY}${conf.padEnd(confW)}${RESET}  ${GRAY}${date.padEnd(dateW)}${RESET}
+    const headline = (opp.headline ?? opp.mainText).slice(0, headlineW);
+    process.stdout.write(`  ${CYAN}${shortId}${RESET}  ${name.padEnd(nameW)}  ${statusColor(st)}${st.padEnd(statusW)}${RESET}  ${headline}
 `);
   }
 }
 function opportunityCard(opp) {
   const width = 58;
   const innerWidth = width - 2;
-  const title = opp.presentation?.title ?? "Opportunity";
+  const title = opp.headline ?? "Opportunity";
   process.stdout.write(`
   ${BLUE}+${"─".repeat(width)}+${RESET}
 `);
@@ -1407,13 +1240,15 @@ function opportunityCard(opp) {
   cardLine(`${BOLD}Status:${RESET}  ${statusColor(st)}${st}${RESET}`);
   if (opp.category)
     cardLine(`${BOLD}Category:${RESET}  ${opp.category}`);
-  if (opp.index?.title)
-    cardLine(`${BOLD}Network:${RESET}  ${opp.index.title}`);
+  if (opp.network?.title)
+    cardLine(`${BOLD}Network:${RESET}  ${opp.network.title}`);
   if (opp.confidence != null)
     cardLine(`${BOLD}Confidence:${RESET}  ${confidenceBar(opp.confidence)}`);
   if (opp.myRole)
     cardLine(`${BOLD}Your role:${RESET}  ${roleLabel(opp.myRole)}`);
-  if (opp.otherParties && opp.otherParties.length > 0) {
+  if (opp.peer?.name)
+    cardLine(`${BOLD}With:${RESET}  ${opp.peer.name}`);
+  else if (opp.otherParties && opp.otherParties.length > 0) {
     process.stdout.write(`  ${BLUE}|${RESET}
 `);
     cardLine(`${BOLD}With:${RESET}`);
@@ -1421,11 +1256,11 @@ function opportunityCard(opp) {
       cardLine(`  ${p.name ?? p.id}  ${roleLabel(p.role)}`);
     }
   }
-  if (opp.presentation?.description) {
+  if (opp.mainText) {
     process.stdout.write(`  ${BLUE}|${RESET}
 `);
     cardLine(`${BOLD}Details:${RESET}`);
-    for (const line of wordWrap(opp.presentation.description, innerWidth - 4)) {
+    for (const line of wordWrap(opp.mainText, innerWidth - 4)) {
       cardLine(`  ${AGENT_TEXT}${line}${RESET}`);
     }
   }
@@ -1463,6 +1298,173 @@ function statusColor(st) {
       return "";
   }
 }
+var ACTION_COLORS = {
+  propose: CYAN,
+  counter: BLUE,
+  accept: GREEN,
+  decline: RED
+};
+function shortDateTime(iso) {
+  return new Date(iso).toLocaleString("en-US", {
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit"
+  });
+}
+function outcomeLabel(outcome) {
+  switch (outcome) {
+    case "agreed":
+      return `${GREEN}agreed${RESET}`;
+    case "declined":
+      return `${RED}declined${RESET}`;
+    case "closed":
+      return `${GRAY}closed${RESET}`;
+    case null:
+      return `${YELLOW}open${RESET}`;
+  }
+}
+function whoseTurn(negotiation) {
+  if (negotiation.awaitingUserId === null)
+    return "nobody";
+  return negotiation.awaitingUserId === negotiation.counterparty.userId ? "them" : "you";
+}
+function counterpartyName(negotiation) {
+  return negotiation.counterparty.name ?? "(unnamed)";
+}
+function negotiationTable(negotiations) {
+  if (negotiations.length === 0) {
+    dim("  No negotiations found.");
+    return;
+  }
+  const idW = 8;
+  const nameW = 22;
+  const turnsW = 5;
+  const turnW = 10;
+  const outcomeW = 8;
+  const dateW = 12;
+  console.log(`  ${BOLD}${"ID".padEnd(idW)}  ${"Counterparty".padEnd(nameW)}  ${"Turns".padEnd(turnsW)}  ${"Whose turn".padEnd(turnW)}  ${"Outcome".padEnd(outcomeW)}  ${"Updated".padEnd(dateW)}${RESET}`);
+  console.log(`  ${GRAY}${"-".repeat(idW)}  ${"-".repeat(nameW)}  ${"-".repeat(turnsW)}  ${"-".repeat(turnW)}  ${"-".repeat(outcomeW)}  ${"-".repeat(dateW)}${RESET}`);
+  for (const negotiation of negotiations) {
+    const shortId = negotiation.opportunityId.slice(0, idW);
+    const name = counterpartyName(negotiation).slice(0, nameW);
+    const turns = String(negotiation.turnCount);
+    const turn = whoseTurn(negotiation);
+    let turnCell = `${GRAY}${"—".padEnd(turnW)}${RESET}`;
+    if (turn === "you")
+      turnCell = `${YELLOW}${BOLD}${"you".padEnd(turnW)}${RESET}`;
+    if (turn === "them")
+      turnCell = `${GRAY}${"them".padEnd(turnW)}${RESET}`;
+    const outcome = outcomeLabel(negotiation.outcome);
+    const date = new Date(negotiation.updatedAt).toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "short",
+      day: "numeric"
+    });
+    console.log(`  ${CYAN}${shortId}${RESET}  ${name.padEnd(nameW)}  ${turns.padEnd(turnsW)}  ${turnCell}  ${outcome}${padTo(outcomeW, stripAnsi(outcome))}  ${GRAY}${date}${RESET}`);
+  }
+}
+function negotiationCard(negotiation) {
+  const name = counterpartyName(negotiation);
+  const rule = `  ${GRAY}${"─".repeat(60)}${RESET}`;
+  let turnLabel = `${GRAY}— settled${RESET}`;
+  if (whoseTurn(negotiation) === "you")
+    turnLabel = `${YELLOW}${BOLD}you${RESET}`;
+  if (whoseTurn(negotiation) === "them")
+    turnLabel = name;
+  console.log();
+  console.log(`  ${BOLD}${CYAN}Negotiation with ${name}${RESET}`);
+  console.log(rule);
+  console.log(`  ${BOLD}Opportunity${RESET}   ${GRAY}${negotiation.opportunityId}${RESET}`);
+  console.log(`  ${BOLD}Outcome${RESET}       ${outcomeLabel(negotiation.outcome)}`);
+  console.log(`  ${BOLD}Turn${RESET}          ${negotiation.turnCount} of ${negotiation.protocol.maxTurns}`);
+  console.log(`  ${BOLD}Whose turn${RESET}    ${turnLabel}`);
+  const [firstLine, ...moreLines] = wordWrap(negotiation.counterparty.statement, 58);
+  console.log(`  ${BOLD}Their intent${RESET}  ${firstLine}`);
+  for (const line of moreLines)
+    console.log(`                ${line}`);
+  console.log();
+  console.log(`  ${BOLD}Transcript${RESET}`);
+  if (negotiation.turns.length === 0)
+    console.log(`  ${GRAY}No turns yet.${RESET}`);
+  for (const turn of negotiation.turns) {
+    const seat = turn.seatUserId === negotiation.counterparty.userId ? name : "You";
+    console.log(`  ${GRAY}${turn.turnIndex + 1}.${RESET} ${BOLD}${seat}${RESET}  ${ACTION_COLORS[turn.action]}${turn.action}${RESET}  ${GRAY}${shortDateTime(turn.createdAt)}${RESET}`);
+    for (const line of wordWrap(turn.message, 66))
+      console.log(`     ${line}`);
+  }
+  const { availableActions, blockedReason, messageLimit } = negotiation.protocol;
+  console.log();
+  if (availableActions.length > 0) {
+    const actions = availableActions.map((action) => `${ACTION_COLORS[action]}${action}${RESET}`).join(", ");
+    console.log(`  ${BOLD}Available actions:${RESET} ${actions}  ${GRAY}(message up to ${messageLimit} characters)${RESET}`);
+  } else {
+    console.log(`  ${BOLD}Available actions:${RESET} ${GRAY}none${RESET}`);
+  }
+  if (blockedReason)
+    console.log(`  ${BOLD}Blocked:${RESET} ${YELLOW}${blockedReason}${RESET}`);
+  console.log(rule);
+  if (availableActions.length > 0) {
+    dim(`  Reply: index negotiation turn ${negotiation.opportunityId.slice(0, 8)} --action <action> --message <text> --expected-turn-count ${negotiation.turnCount}`);
+  }
+  console.log();
+}
+function agentCard(selected) {
+  const { agent, onboardingCompletedAt } = selected;
+  const rule = `  ${GRAY}${"─".repeat(50)}${RESET}`;
+  console.log();
+  console.log(`  ${BOLD}${CYAN}${agent.name}${RESET}`);
+  console.log(rule);
+  console.log(`  ${BOLD}Seat${RESET}          External negotiator (negotiates instead of Index's hosted agent)`);
+  console.log(`  ${BOLD}Status${RESET}        ${agent.status === "active" ? GREEN : GRAY}${agent.status}${RESET}`);
+  if (agent.description)
+    console.log(`  ${BOLD}Description${RESET}   ${agent.description}`);
+  console.log(`  ${BOLD}Last seen${RESET}     ${GRAY}${agent.lastSeenAt ? shortDateTime(agent.lastSeenAt) : "never"}${RESET}`);
+  const onboarding = onboardingCompletedAt ? `${GREEN}complete${RESET} ${GRAY}(${shortDateTime(onboardingCompletedAt)})${RESET}` : `${YELLOW}not complete${RESET}`;
+  console.log(`  ${BOLD}Onboarding${RESET}    ${onboarding}`);
+  console.log(`  ${BOLD}ID${RESET}            ${GRAY}${agent.id}${RESET}`);
+  console.log(rule);
+  console.log();
+}
+function agentConversation(conversation) {
+  const seat = conversation.agent.status === "hosted" ? "Index's hosted agent" : "your external negotiator";
+  const rule = `  ${GRAY}${"─".repeat(60)}${RESET}`;
+  console.log();
+  console.log(`  ${BOLD}${CYAN}Personal agent${RESET}  ${GRAY}answered by ${seat}${RESET}`);
+  console.log(rule);
+  if (conversation.messages.length === 0)
+    console.log(`  ${GRAY}No messages yet.${RESET}`);
+  for (const message of conversation.messages) {
+    const author = message.role === "user" ? `${BOLD}${CYAN}you${RESET}` : `${BOLD}${BLUE}agent${RESET}`;
+    const text = message.parts.filter((part) => part.kind === "text" && part.text).map((part) => part.text).join(`
+`);
+    console.log(`  ${author}  ${GRAY}${shortDateTime(message.createdAt)}${RESET}`);
+    for (const line of wordWrap(text, 70))
+      console.log(`  ${line}`);
+    console.log();
+  }
+  const { questions } = conversation.agent;
+  if (questions.length === 0) {
+    console.log(`  ${GRAY}No questions waiting for you.${RESET}`);
+    console.log();
+    return;
+  }
+  console.log(`  ${BOLD}${YELLOW}Waiting for your answer (${questions.length})${RESET}`);
+  for (const question of questions) {
+    const [firstLine, ...moreLines] = wordWrap(question.question, 66);
+    console.log(`  ${YELLOW}?${RESET} ${BOLD}${firstLine}${RESET}`);
+    for (const line of moreLines)
+      console.log(`    ${BOLD}${line}${RESET}`);
+    console.log(`    ${GRAY}Question ID${RESET}  ${CYAN}${question.id}${RESET}`);
+    if (question.options?.length)
+      console.log(`    ${GRAY}Options${RESET}      ${question.options.join(" / ")}`);
+    if (question.matches.length > 0) {
+      const about = question.matches.map((match) => `${match.counterparty.name ?? "(unnamed)"} ${GRAY}(${match.opportunityId.slice(0, 8)})${RESET}`).join(", ");
+      console.log(`    ${GRAY}About${RESET}        ${about}`);
+    }
+    console.log();
+  }
+}
 function networkTable(networks) {
   if (networks.length === 0) {
     dim("  No networks found.");
@@ -1588,7 +1590,7 @@ function messageList(messages) {
       month: "short",
       day: "numeric"
     });
-    const textParts = msg.parts.filter((p) => p.type === "text" && p.text).map((p) => p.text).join("");
+    const textParts = msg.parts.filter((p) => p.kind === "text" && p.text).map((p) => p.text).join("");
     console.log(`  ${CYAN}${sender}${RESET}  ${GRAY}${date} ${time}${RESET}`);
     console.log(`  ${textParts}`);
     console.log();
@@ -1596,17 +1598,20 @@ function messageList(messages) {
 }
 // src/profile.command.ts
 async function handleProfile(client, subcommand, positionals, options = {}) {
-  if (subcommand === "create") {
-    await profileCreate(client, options, options?.json);
-    return;
-  }
   if (subcommand === "update") {
-    const action = positionals.join(" ");
-    if (!action) {
-      error("Usage: index profile update <action> [--details <text>]", 1);
-      return;
+    const { name, intro, location, socials } = options;
+    if (name === undefined && intro === undefined && location === undefined && socials === undefined) {
+      throw new Error("Usage: index profile update [--name <text>] [--intro <text>] [--location <text>] [--social label=value]");
     }
-    await profileUpdate(client, action, options.details, options?.json);
+    const user = await client.updateProfile({ name, intro, location, socials });
+    if (options.json)
+      console.log(JSON.stringify(user));
+    else
+      success("Profile updated.");
+    return;
+  }
+  if (subcommand === "create" || subcommand === "search") {
+    error(`profile ${subcommand} is not available; use "index profile sync" for public research prefill`, 1);
     return;
   }
   if (subcommand === "sync") {
@@ -1622,35 +1627,6 @@ async function handleProfile(client, subcommand, positionals, options = {}) {
     await profileShow(client, userId, options?.json);
     return;
   }
-  if (subcommand === "search") {
-    const query = positionals.join(" ");
-    if (!query) {
-      error("Usage: index profile search <query>", 1);
-      return;
-    }
-    const result = await client.readUserContexts({ query });
-    if (options.json) {
-      console.log(JSON.stringify(result));
-      return;
-    }
-    if (!result.success) {
-      error(result.error ?? "Search failed", 1);
-      return;
-    }
-    const data = result.data;
-    heading("Search Results");
-    if (!data.profiles?.length) {
-      dim("  No profiles found.");
-    } else {
-      for (const p of data.profiles) {
-        console.log(`  ${p.name} (${p.userId.slice(0, 8)})`);
-        if (p.bio)
-          dim(`    ${p.bio.slice(0, 100)}`);
-      }
-    }
-    console.log();
-    return;
-  }
   await profileMe(client, options?.json);
 }
 async function profileMe(client, json) {
@@ -1685,61 +1661,26 @@ async function profileSync(client, json) {
     return;
   }
   success("Profile enriched.");
-  if (result.profile.name)
+  if (result.profile?.name)
     dim(`  Name: ${result.profile.name}`);
-  if (result.profile.location)
+  if (result.profile?.location)
     dim(`  Location: ${result.profile.location}`);
-  dim(`  Social links: ${result.profile.socials.length}`);
-}
-async function profileCreate(client, options, json) {
-  if (!json)
-    info("Creating profile...");
-  const query = { confirm: true };
-  if (options.linkedin)
-    query.linkedinUrl = options.linkedin;
-  if (options.github)
-    query.githubUrl = options.github;
-  if (options.twitter)
-    query.twitterUrl = options.twitter;
-  const result = await client.createUserContext(query);
-  if (json) {
-    console.log(JSON.stringify(result));
-    return;
-  }
-  if (!result.success) {
-    error(result.error ?? "Profile creation failed", 1);
-    return;
-  }
-  success("Profile created.");
-}
-async function profileUpdate(client, action, details, json) {
-  if (!json)
-    info("Updating profile...");
-  const query = { action };
-  if (details)
-    query.details = details;
-  const result = await client.updateUserContext(query);
-  if (json) {
-    console.log(JSON.stringify(result));
-    return;
-  }
-  if (!result.success) {
-    error(result.error ?? "Profile update failed", 1);
-    return;
-  }
-  success("Profile updated.");
+  dim(`  Social links: ${result.profile?.socials?.length ?? 0}`);
 }
 // src/intent.command.ts
 var INTENT_HELP = `
 Usage:
-  index intent list [--archived] [--limit <n>]  List your signals
-  index intent show <id>                        Show signal details (accepts short ID)
-  index intent create <content>                 Create a signal from text
-  index intent update <id> <content>            Update a signal's description
-  index intent archive <id>                     Archive a signal (accepts short ID)
-  index intent link <id> <network-id>           Link a signal to a network
-  index intent unlink <id> <network-id>         Unlink a signal from a network
+  index intent list [--archived] [--limit <n>] [--query <text>]  List your intents
+  index intent show <id>                        Show intent details (accepts short ID)
+  index intent prepare <content> [--answer 'prompt=reply']  Review and repair a draft
+  index intent create <content> [--receipt <token>]         Create an admitted intent
+  index intent pause <id> | resume <id>         Hold or restart its agent
+  index intent update <id> <content>            Update an intent's description
+  index intent archive <id>                     Archive an intent (accepts short ID)
+  index intent networks <id>                    List the networks an intent is shared in
+  index intent add-to-network <id> <network-id>      Add an intent to a network
+  index intent remove-from-network <id> <network-id> Remove an intent from a network
 `;
 async function handleIntent(client, subcommand, options) {
   if (!subcommand) {
@@ -1754,13 +1695,14 @@ async function handleIntent(client, subcommand, options) {
     case "list": {
       const result = await client.listIntents({
         archived: options.archived,
-        limit: options.limit
+        limit: options.limit,
+        query: options.query
       });
       if (options.json) {
         console.log(JSON.stringify(result));
         return;
       }
-      heading("Signals");
+      heading("Intents");
       intentTable(result.intents);
       if (result.pagination.totalCount > 0) {
         dim(`
@@ -1771,7 +1713,7 @@ async function handleIntent(client, subcommand, options) {
     }
     case "show": {
       if (!options.intentId) {
-        error("Missing signal ID. Usage: index intent show <id>", 1);
+        error("Missing intent ID. Usage: index intent show <id>", 1);
         return;
       }
       const intent = await client.getIntent(options.intentId);
@@ -1782,39 +1724,36 @@ async function handleIntent(client, subcommand, options) {
       intentCard(intent);
       return;
     }
+    case "prepare": {
+      if (!options.intentContent)
+        throw new Error("Usage: index intent prepare <content> [--answer 'prompt=reply']");
+      const prepared = await client.prepareIntent(options.intentContent, (options.answers ?? []).map(({ key, value }) => ({ prompt: key, answer: value })));
+      if (options.json) {
+        console.log(JSON.stringify(prepared));
+        return;
+      }
+      intentPreparation(prepared);
+      return;
+    }
     case "create": {
       if (!options.intentContent) {
         error("Missing content. Usage: index intent create <content>", 1);
         return;
       }
       if (!options.json)
-        info("Processing signal...");
-      const result = await client.callTool("create_intent", {
-        description: options.intentContent
-      });
+        info("Processing intent...");
+      const result = await client.createIntent(options.intentContent, options.targetId ? [options.targetId] : undefined, options.receipt);
       if (options.json) {
         console.log(JSON.stringify(result));
         return;
       }
-      if (!result.success) {
-        error(result.error ?? "Failed to create signal", 1);
-        return;
-      }
-      const proposals = parseIntentProposals(result.data?.message);
-      if (proposals.length === 0) {
-        error("Signal proposal could not be parsed from the response.", 1);
-        return;
-      }
-      for (const proposal of proposals) {
-        await client.confirmIntent(proposal.proposalId, proposal.description);
-        success("Signal created.");
-        dim(`  ${proposal.description}`);
-      }
+      success("Intent created.");
+      dim(`  shared in ${result.networkIds.length} network${result.networkIds.length === 1 ? "" : "s"}`);
       return;
     }
     case "update": {
       if (!options.intentId) {
-        error("Missing signal ID. Usage: index intent update <id> <content>", 1);
+        error("Missing intent ID. Usage: index intent update <id> <content>", 1);
         return;
       }
       if (!options.intentContent) {
@@ -1822,108 +1761,96 @@ async function handleIntent(client, subcommand, options) {
         return;
       }
       if (!options.json)
-        info("Updating signal...");
+        info("Updating intent...");
       const result = await client.updateIntent(options.intentId, options.intentContent);
       if (options.json) {
         console.log(JSON.stringify(result));
         return;
       }
-      if (!result.success) {
-        error(result.error ?? "Failed to update signal", 1);
-        return;
-      }
-      success("Signal updated.");
+      success("Intent updated.");
+      return;
+    }
+    case "pause":
+    case "resume": {
+      if (!options.intentId)
+        throw new Error(`Usage: index intent ${subcommand} <id>`);
+      const status = subcommand === "pause" ? "PAUSED" : "ACTIVE";
+      await client.updateIntentStatus(options.intentId, status);
+      if (options.json)
+        console.log(JSON.stringify({ intentId: options.intentId, status }));
+      else
+        success(`Intent ${status.toLowerCase()}.`);
       return;
     }
     case "archive": {
       if (!options.intentId) {
-        error("Missing signal ID. Usage: index intent archive <id>", 1);
+        error("Missing intent ID. Usage: index intent archive <id>", 1);
         return;
       }
-      const intent = await client.getIntent(options.intentId);
-      const result = await client.callTool("delete_intent", { intentId: intent.id });
+      await client.archiveIntent(options.intentId);
       if (options.json) {
-        console.log(JSON.stringify(result));
+        console.log(JSON.stringify({ success: true }));
         return;
       }
-      if (!result.success) {
-        error(result.error ?? "Failed to archive signal", 1);
+      success(`Intent ${options.intentId} archived.`);
+      return;
+    }
+    case "networks": {
+      if (!options.intentId) {
+        error("Usage: index intent networks <intent-id>", 1);
         return;
       }
-      success(`Signal ${options.intentId} archived.`);
+      const networkIds = await client.listIntentNetworks(options.intentId);
+      if (options.json) {
+        console.log(JSON.stringify({ networkIds }));
+        return;
+      }
+      heading("Networks");
+      for (const networkId of networkIds)
+        dim(`  ${networkId}`);
+      console.log();
       return;
     }
-    case "link": {
+    case "add-to-network": {
       if (!options.intentId || !options.targetId) {
-        error("Usage: index intent link <intent-id> <network-id>", 1);
+        error("Usage: index intent add-to-network <intent-id> <network-id>", 1);
         return;
       }
-      const intent = await client.getIntent(options.intentId);
-      const result = await client.callTool("create_intent_index", {
-        intentId: intent.id,
-        networkId: options.targetId
-      });
+      await client.addIntentToNetwork(options.intentId, options.targetId);
       if (options.json) {
-        console.log(JSON.stringify(result));
+        console.log(JSON.stringify({ success: true }));
         return;
       }
-      if (!result.success) {
-        error(result.error ?? "Failed to link signal", 1);
-        return;
-      }
-      success("Signal linked to network.");
+      success("Intent added to network.");
       return;
     }
-    case "unlink": {
+    case "remove-from-network": {
       if (!options.intentId || !options.targetId) {
-        error("Usage: index intent unlink <intent-id> <network-id>", 1);
+        error("Usage: index intent remove-from-network <intent-id> <network-id>", 1);
         return;
       }
-      const intent = await client.getIntent(options.intentId);
-      const result = await client.callTool("delete_intent_index", {
-        intentId: intent.id,
-        networkId: options.targetId
-      });
+      await client.removeIntentFromNetwork(options.intentId, options.targetId);
       if (options.json) {
-        console.log(JSON.stringify(result));
-        return;
-      }
-      if (!result.success) {
-        error(result.error ?? "Failed to unlink signal", 1);
+        console.log(JSON.stringify({ success: true }));
         return;
       }
-      success("Signal unlinked from network.");
+      success("Intent removed from network.");
       return;
     }
   }
 }
-function parseIntentProposals(message) {
-  if (!message)
-    return [];
-  const proposals = [];
-  const blockRegex = /```intent_proposal\s*\n([\s\S]*?)\n```/g;
-  let match;
-  while ((match = blockRegex.exec(message)) !== null) {
-    try {
-      const parsed = JSON.parse(match[1]);
-      if (parsed.proposalId && parsed.description) {
-        proposals.push({ proposalId: parsed.proposalId, description: parsed.description });
-      }
-    } catch {}
-  }
-  return proposals;
-}
 // src/opportunity.command.ts
 var OPPORTUNITY_HELP = `
 Usage:
   index opportunity list                        List your opportunities
-  index opportunity list --status <s>           Filter by status (pending|accepted|rejected|expired)
+  index opportunity list --intent-id <id> --statuses negotiating,pending,accepted,expired
+  index opportunity list --status <s>           Filter by one settled or actionable status
   index opportunity list --limit <n>            Limit results
   index opportunity show <id>                   Show full opportunity details (accepts short ID)
   index opportunity accept <id>                 Accept an opportunity (accepts short ID)
-  index opportunity accept <id> --acknowledge-uptake <id,id>  Continue after an uptake advisory
   index opportunity reject <id>                 Reject an opportunity (accepts short ID)
+  index opportunity start-chat <id>             Open the chat through this opportunity
 `;
 async function handleOpportunity(client, subcommand, options) {
   if (!subcommand) {
@@ -1936,7 +1863,7 @@ async function handleOpportunity(client, subcommand, options) {
   }
   switch (subcommand) {
     case "list":
-      await opportunityList(client, options.status, options.limit, options.json);
+      await opportunityList(client, options.status, options.statuses, options.intentId, options.limit, options.json);
       return;
     case "show":
       if (!options.targetId) {
@@ -1950,7 +1877,7 @@ async function handleOpportunity(client, subcommand, options) {
         error("Missing opportunity ID. Usage: index opportunity accept <id>", 1);
         return;
       }
-      await opportunityStatusUpdate(client, options.targetId, "accepted", options.json, options.acknowledgeUptake);
+      await opportunityStatusUpdate(client, options.targetId, "accepted", options.json);
       return;
     case "reject":
       if (!options.targetId) {
@@ -1959,13 +1886,23 @@ async function handleOpportunity(client, subcommand, options) {
       }
       await opportunityStatusUpdate(client, options.targetId, "rejected", options.json);
       return;
+    case "start-chat": {
+      if (!options.targetId)
+        throw new Error("Usage: index opportunity start-chat <id>");
+      const result = await client.startOpportunityChat(options.targetId);
+      if (options.json)
+        console.log(JSON.stringify(result));
+      else
+        success(`Chat opened: ${result.conversationId}`);
+      return;
+    }
     default:
       error(`Unknown subcommand: ${subcommand}`, 1);
       return;
   }
 }
-async function opportunityList(client, status2, limit, json) {
-  const opportunities = await client.listOpportunities({ status: status2, limit });
+async function opportunityList(client, status, statuses, intentId, limit, json) {
+  const opportunities = await client.listOpportunities({ status, statuses, intentId, limit });
   if (json) {
     console.log(JSON.stringify(opportunities));
     return;
@@ -1982,225 +1919,74 @@ async function opportunityShow(client, id, json) {
   }
   opportunityCard(opportunity);
 }
-async function opportunityStatusUpdate(client, id, status2, json, acknowledgedUptakeQuestionIds) {
+async function opportunityStatusUpdate(client, id, status, json) {
   const opportunity = await client.getOpportunity(id);
-  if (status2 === "accepted") {
-    try {
-      const result2 = await client.updateOpportunityStatus(opportunity.id, "accepted", acknowledgedUptakeQuestionIds);
-      if (json) {
-        console.log(JSON.stringify(result2));
-        return;
-      }
-      success("Opportunity accepted.");
-    } catch (error2) {
-      const advisory = uptakeAdvisoryFromError(error2);
-      if (json && error2 instanceof ApiError) {
-        console.log(JSON.stringify(error2.response ?? { error: error2.message }));
-        return;
-      }
-      if (!advisory)
-        throw error2;
-      heading("Questions before accepting");
-      for (const question of advisory.advisory.questions) {
-        console.log(`
-${question.title}`);
-        console.log(question.prompt);
-        for (const option of question.options) {
-          console.log(`  - ${option.label}${option.description ? ` — ${option.description}` : ""}`);
-        }
-        dim(`  Question ID: ${question.id}`);
-      }
-      const ids = advisory.advisory.questions.map((question) => question.id).join(",");
-      info(`Answer or dismiss these questions, then retry. To continue anyway, run:
-  index opportunity accept ${opportunity.id} --acknowledge-uptake ${ids}`);
-    }
-    return;
-  }
-  const result = await client.updateOpportunityStatus(opportunity.id, "rejected");
+  const result = await client.updateOpportunityStatus(opportunity.id, status);
   if (json) {
     console.log(JSON.stringify(result));
     return;
   }
-  success("Opportunity rejected.");
-}
-function uptakeAdvisoryFromError(error2) {
-  if (!(error2 instanceof ApiError) || error2.status !== 409)
-    return null;
-  const body = error2.response;
-  return body?.advisory?.code === "unresolved_uptake_questions" ? body : null;
+  success(`Opportunity ${status}.`);
 }
 // src/negotiation.command.ts
-var NEGOTIATION_HELP = `
-Usage:
-  index negotiation list                        List your agent's negotiations
-  index negotiation list --limit <n>            Limit results
-  index negotiation list --since <date|duration> Filter by time (ISO date or duration like 1h, 2d, 1w)
-  index negotiation show <id>                   Show negotiation turn-by-turn details
-`;
 async function handleNegotiation(client, subcommand, options) {
-  if (!subcommand) {
+  if (subcommand === "list") {
+    if (options.state !== undefined && options.state !== "open" && options.state !== "settled")
+      throw new Error("--state must be open or settled");
+    const negotiations = await client.listNegotiations({ intentId: options.intentId, state: options.state });
     if (options.json) {
-      console.log(JSON.stringify({ error: "No subcommand provided" }));
-    } else {
-      console.log(NEGOTIATION_HELP);
-    }
-    return;
-  }
-  switch (subcommand) {
-    case "list":
-      await negotiationList(client, options.limit, options.since, options.json);
+      console.log(JSON.stringify(negotiations));
       return;
-    case "show":
-      if (!options.targetId) {
-        error("Missing negotiation ID. Usage: index negotiation show <id>", 1);
+    }
+    heading("Negotiations");
+    negotiationTable(negotiations);
+    if (negotiations.length > 0)
+      dim(`
+  Details: index negotiation show <id>  (the short ID works)`);
+    console.log();
+  } else if (subcommand === "show" || subcommand === "turn") {
+    if (!options.targetId)
+      throw new Error("An opportunity ID is required");
+    if (subcommand === "show") {
+      const negotiation = await client.getNegotiation(options.targetId);
+      if (options.json) {
+        console.log(JSON.stringify(negotiation));
         return;
       }
-      await negotiationShow(client, options.targetId, options.json);
-      return;
-    default:
-      error(`Unknown subcommand: ${subcommand}`, 1);
-      return;
-  }
-}
-function resolveSince(input) {
-  const match = input.match(/^(\d+)([smhdw])$/);
-  if (match) {
-    const n = parseInt(match[1], 10);
-    const unit = match[2];
-    const ms = { s: 1000, m: 60000, h: 3600000, d: 86400000, w: 604800000 }[unit];
-    return new Date(Date.now() - n * ms).toISOString();
-  }
-  const d = new Date(input);
-  if (isNaN(d.getTime()))
-    throw new Error(`Invalid --since value: "${input}". Use ISO date or duration like 1h, 2d, 1w.`);
-  return d.toISOString();
-}
-async function negotiationList(client, limit, since, json) {
-  const sinceIso = since ? resolveSince(since) : undefined;
-  const negotiations = await client.listNegotiations({ limit, since: sinceIso });
-  if (json) {
-    console.log(JSON.stringify(negotiations));
-    return;
-  }
-  heading("Negotiations");
-  negotiationTable(negotiations);
-  console.log();
-}
-async function negotiationShow(client, id, json) {
-  const negotiations = await client.listNegotiations({ limit: 50 });
-  const match = negotiations.find((n) => n.id === id || n.id.startsWith(id));
-  if (!match) {
-    error(`Negotiation not found: ${id}`, 1);
-    return;
-  }
-  if (json) {
-    console.log(JSON.stringify(match));
-    return;
-  }
-  negotiationCard(match);
-}
-var { BOLD: BOLD2, RESET: RESET2, CYAN: CYAN2, GRAY: GRAY2, GREEN: GREEN2, YELLOW: YELLOW2, BLUE: BLUE2, DIM: DIM2 } = exports_output;
-function outcomeLabel(outcome) {
-  if (!outcome)
-    return `${GRAY2}unknown${RESET2}`;
-  return outcome.hasOpportunity ? `${GREEN2}opportunity${RESET2}` : `${GRAY2}no match${RESET2}`;
-}
-function roleLabel2(role) {
-  switch (role) {
-    case "agent":
-      return `${GREEN2}helper${RESET2}`;
-    case "patient":
-      return `${YELLOW2}seeker${RESET2}`;
-    case "peer":
-      return `${CYAN2}peer${RESET2}`;
-    default:
-      return `${GRAY2}-${RESET2}`;
-  }
-}
-function actionColorFor(action) {
-  switch (action) {
-    case "accept":
-      return GREEN2;
-    case "reject":
-      return RED;
-    default:
-      return BLUE2;
-  }
-}
-function negotiationTable(negotiations) {
-  if (negotiations.length === 0) {
-    dim("  No negotiations found.");
-    return;
-  }
-  const idW = 8;
-  const nameW = 22;
-  const outcomeW = 14;
-  const roleW = 8;
-  const turnsW = 6;
-  const dateW = 20;
-  process.stdout.write(`  ${BOLD2}${"ID".padEnd(idW)}  ${"Counterparty".padEnd(nameW)}  ${"Outcome".padEnd(outcomeW)}  ${"Role".padEnd(roleW)}  ${"Turns".padEnd(turnsW)}  ${"Created".padEnd(dateW)}${RESET2}
-`);
-  process.stdout.write(`  ${GRAY2}${"-".repeat(idW)}  ${"-".repeat(nameW)}  ${"-".repeat(outcomeW)}  ${"-".repeat(roleW)}  ${"-".repeat(turnsW)}  ${"-".repeat(dateW)}${RESET2}
-`);
-  for (const n of negotiations) {
-    const shortId = n.id.slice(0, 8);
-    const name = (n.counterparty?.name ?? "Unknown").slice(0, nameW);
-    const turns = String(n.outcome?.turnCount ?? n.turns?.length ?? "-");
-    const date = n.createdAt ? new Date(n.createdAt).toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric"
-    }) : "-";
-    const outcomeStr = outcomeLabel(n.outcome);
-    const roleStr = roleLabel2(n.outcome?.role);
-    process.stdout.write(`  ${CYAN2}${shortId}${RESET2}  ${name.padEnd(nameW)}  ${outcomeStr}${padTo(outcomeW, stripAnsi(outcomeStr))}  ${roleStr}${padTo(roleW, stripAnsi(roleStr))}  ${turns.padEnd(turnsW)}  ${GRAY2}${date}${RESET2}
-`);
-  }
-}
-function negotiationCard(n) {
-  console.log();
-  console.log(`  ${BOLD2}${CYAN2}Negotiation Details${RESET2}`);
-  console.log(`  ${GRAY2}${"─".repeat(60)}${RESET2}`);
-  console.log(`  ${BOLD2}ID${RESET2}             ${GRAY2}${n.id}${RESET2}`);
-  console.log(`  ${BOLD2}Counterparty${RESET2}   ${n.counterparty?.name ?? "Unknown"}`);
-  console.log(`  ${BOLD2}Outcome${RESET2}        ${outcomeLabel(n.outcome)}`);
-  console.log(`  ${BOLD2}Your Role${RESET2}      ${roleLabel2(n.outcome?.role)}`);
-  console.log(`  ${BOLD2}Turns${RESET2}          ${n.outcome?.turnCount ?? n.turns?.length ?? "-"}`);
-  console.log(`  ${BOLD2}Created${RESET2}        ${GRAY2}${new Date(n.createdAt).toLocaleString()}${RESET2}`);
-  if (n.turns && n.turns.length > 0) {
-    console.log();
-    console.log(`  ${BOLD2}Turn-by-Turn${RESET2}`);
-    console.log(`  ${GRAY2}${"─".repeat(60)}${RESET2}`);
-    for (let i = 0;i < n.turns.length; i++) {
-      const t = n.turns[i];
-      const time = new Date(t.createdAt).toLocaleTimeString("en-US", {
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit"
+      negotiationCard(negotiation);
+    } else {
+      if (!options.action || !["propose", "counter", "accept", "decline"].includes(options.action))
+        throw new Error("--action must be propose, counter, accept, or decline");
+      if (!options.message?.trim())
+        throw new Error("--message is required");
+      if (options.expectedTurnCount === undefined || !Number.isSafeInteger(options.expectedTurnCount) || options.expectedTurnCount < 0)
+        throw new Error("--expected-turn-count must be the observed nonnegative integer turn count");
+      const negotiation = await client.submitNegotiationTurn(options.targetId, {
+        action: options.action,
+        message: options.message,
+        expectedTurnCount: options.expectedTurnCount
       });
-      const actionColor = actionColorFor(t.action);
-      console.log(`  ${DIM2}Turn ${i + 1}${RESET2}  ${CYAN2}${t.speaker?.name ?? "?"}${RESET2}  ${actionColor}${t.action}${RESET2}  ${GRAY2}${time}${RESET2}`);
-      if (t.suggestedRoles) {
-        console.log(`  ${DIM2}  roles: own=${t.suggestedRoles.ownUser ?? "?"} other=${t.suggestedRoles.otherUser ?? "?"}${RESET2}`);
-      }
-      if (t.reasoning) {
-        const lines = wordWrap(t.reasoning, 72);
-        for (const line of lines) {
-          console.log(`  ${DIM2}  ${line}${RESET2}`);
-        }
+      if (options.json) {
+        console.log(JSON.stringify(negotiation));
+        return;
       }
-      console.log();
+      success(`Turn submitted: ${options.action}`);
+      negotiationCard(negotiation);
     }
+  } else {
+    throw new Error("Usage: index negotiation list [--intent-id <id>] [--state open|settled], show <opportunity-id>, or turn <opportunity-id> --action <action> --message <text> --expected-turn-count <n>");
   }
-  console.log(`  ${GRAY2}${"─".repeat(60)}${RESET2}`);
-  console.log();
 }
 // src/network.command.ts
 var NETWORK_HELP = `
 Network Commands:
   index network list                     List your networks
+  index network discover                 Find public networks to join
+  index network requests                 See your network creation requests
+  index network request-update <id> --title <name> [--prompt <purpose>]
+  index network request-dismiss <id>    Dismiss your request
   index network create <name>            Create directly or submit an early-access request
   index network create <name> --prompt   Create directly or request early access with a description
   index network show <id|key>            Show network details and members
@@ -2220,6 +2006,47 @@ async function handleNetwork(client, subcommand, positionals, options) {
     case "list":
       await networkList(client, options.json);
       return;
+    case "discover": {
+      const result = await client.discoverNetworks();
+      if (options.json)
+        console.log(JSON.stringify(result));
+      else {
+        heading("Public networks");
+        networkTable(result.networks);
+      }
+      return;
+    }
+    case "requests": {
+      const result = await client.listNetworkRequests();
+      if (options.json)
+        console.log(JSON.stringify(result));
+      else {
+        heading("Your network requests");
+        for (const request of result.requests)
+          dim(`  ${request.id} · ${request.title} · ${request.status}`);
+      }
+      return;
+    }
+    case "request-update": {
+      if (!positionals[0] || !options.title)
+        throw new Error("Usage: index network request-update <id> --title <name> [--prompt <purpose>]");
+      const result = await client.updateNetworkRequest(positionals[0], options.title, options.prompt);
+      if (options.json)
+        console.log(JSON.stringify(result));
+      else
+        success("Network request resubmitted.");
+      return;
+    }
+    case "request-dismiss": {
+      if (!positionals[0])
+        throw new Error("Usage: index network request-dismiss <id>");
+      await client.dismissNetworkRequest(positionals[0]);
+      if (options.json)
+        console.log(JSON.stringify({ success: true }));
+      else
+        success("Network request dismissed.");
+      return;
+    }
     case "create":
       await networkCreate(client, positionals[0], options.prompt, options.json);
       return;
@@ -2247,13 +2074,12 @@ async function handleNetwork(client, subcommand, positionals, options) {
 }
 async function networkList(client, json) {
   const networks = await client.listNetworks();
-  const filtered = networks.filter((n) => !n.isPersonal);
   if (json) {
-    console.log(JSON.stringify(filtered));
+    console.log(JSON.stringify(networks));
     return;
   }
   heading("Networks");
-  networkTable(filtered);
+  networkTable(networks);
   console.log();
 }
 async function networkCreate(client, name, prompt, json) {
@@ -2334,13 +2160,9 @@ async function networkUpdate(client, id, options, json) {
     error("Provide at least --title or --prompt. Usage: index network update <id> [--title <t>] [--prompt <p>]", 1);
     return;
   }
-  const result = await client.callTool("update_network", { networkId: id, settings });
+  const network = await client.updateNetwork(id, settings);
   if (json) {
-    console.log(JSON.stringify(result));
-    return;
-  }
-  if (!result.success) {
-    error(result.error ?? "Network update failed", 1);
+    console.log(JSON.stringify({ network }));
     return;
   }
   success("Network updated.");
@@ -2350,13 +2172,9 @@ async function networkDelete(client, id, json) {
     error("Usage: index network delete <id>", 1);
     return;
   }
-  const result = await client.callTool("delete_network", { networkId: id });
+  await client.deleteNetwork(id);
   if (json) {
-    console.log(JSON.stringify(result));
-    return;
-  }
-  if (!result.success) {
-    error(result.error ?? "Network deletion failed", 1);
+    console.log(JSON.stringify({ success: true }));
     return;
   }
   success("Network deleted.");
@@ -2380,6 +2198,47 @@ async function networkInvite(client, id, email, json) {
     dim("  Created a pending account for this invitee.");
 }
+// src/sse.parser.ts
+function parseSSEEvents(chunk) {
+  if (!chunk)
+    return [];
+  const events = [];
+  const rawEvents = chunk.split(`
+`);
+  for (let i = 0;i < rawEvents.length; i++) {
+    const raw = rawEvents[i].trim();
+    if (!raw)
+      continue;
+    if (i === rawEvents.length - 1 && !chunk.endsWith(`
+`)) {
+      continue;
+    }
+    let eventType;
+    const dataLines = [];
+    for (const line of raw.split(`
+`)) {
+      if (line.startsWith(":")) {
+        continue;
+      }
+      if (line.startsWith("event:")) {
+        eventType = line.slice("event:".length).trim();
+      } else if (line.startsWith("data:")) {
+        dataLines.push(line.slice("data:".length).trim());
+      }
+    }
+    if (dataLines.length > 0) {
+      events.push({
+        event: eventType,
+        data: dataLines.join(`
+`)
+      });
+    }
+  }
+  return events;
+}
 // src/conversation.command.ts
 var CONVERSATION_HELP = `
 Conversation Commands:
@@ -2388,13 +2247,63 @@ Conversation Commands:
   index conversation show <id>             Show messages (accepts short ID)
   index conversation show <id> --limit <n> Limit number of messages
   index conversation send <id> <message>   Send a message (accepts short ID)
+  index conversation show agent --intent-id <id>  Read scoped agent state
+  index conversation send agent <text> --intent-id <id> [--question-id <id>]
+  index conversation answer agent --intent-id <id> --answer 'question-id=text' [--answer ...]
   index conversation stream                Listen for real-time events (SSE)
 `;
 async function handleConversation(client, subcommand, positionals, options) {
-  if (!subcommand) {
-    error("Agent chat is no longer available from the CLI. Use `index conversation list` " + "for your conversations, or chat in the Index app.", 1);
+  if (positionals[0] === "agent" && (subcommand === "show" || subcommand === "send")) {
+    if (!options?.intentId)
+      throw new Error("Personal-agent conversations require --intent-id <id>");
+    if (subcommand === "show") {
+      const conversation = await client.getAgentConversation(options.intentId);
+      if (options.json) {
+        console.log(JSON.stringify(conversation));
+        return;
+      }
+      agentConversation(conversation);
+      if (conversation.agent.questions.length > 0) {
+        dim(`  Answer: index conversation answer agent --intent-id ${options.intentId} --answer '<question-id>=<reply>'`);
+      }
+      return;
+    }
+    const text = positionals.slice(1).join(" ");
+    if (!text.trim())
+      throw new Error("A message is required");
+    if (options.questionId) {
+      const answers = [{ questionId: options.questionId, text }];
+      const result = await client.answerAgentQuestions(options.intentId, answers);
+      if (options.json) {
+        console.log(JSON.stringify(result));
+        return;
+      }
+      printAgentAnswers(answers, result.messages);
+      return;
+    }
+    const message = await client.sendMessage("agent", text, options.intentId);
+    if (options.json) {
+      console.log(JSON.stringify(message));
+      return;
+    }
+    success(`Message sent to your agent (${message.id})`);
+    return;
+  }
+  if (subcommand === "answer") {
+    if (positionals[0] !== "agent" || !options?.intentId || !options.answers?.length) {
+      throw new Error("Usage: index conversation answer agent --intent-id <id> --answer 'question-id=text' [--answer ...]");
+    }
+    const answers = options.answers.map(({ key, value }) => ({ questionId: key, text: value }));
+    const result = await client.answerAgentQuestions(options.intentId, answers);
+    if (options.json) {
+      console.log(JSON.stringify(result));
+      return;
+    }
+    printAgentAnswers(answers, result.messages);
     return;
   }
+  if (!subcommand)
+    throw new Error(CONVERSATION_HELP.trim());
   switch (subcommand) {
     case "list":
       await conversationList(client, options?.json);
@@ -2409,15 +2318,25 @@ async function handleConversation(client, subcommand, positionals, options) {
       await conversationSend(client, positionals[0], positionals.slice(1), options?.json);
       return;
     case "stream":
-      await conversationStream(client);
+      await conversationStream(client, options?.json);
       return;
     case "help":
-      console.log(CONVERSATION_HELP);
+      console.log(options?.json ? JSON.stringify({ help: CONVERSATION_HELP.trim() }) : CONVERSATION_HELP);
       return;
     default:
       error(`Unknown conversation subcommand: ${subcommand}`, 1);
   }
 }
+function printAgentAnswers(answers, messages) {
+  for (const [index, message] of messages.entries()) {
+    const { questionId } = answers[index];
+    if (message.metadata.principalMessage.kind === "answer") {
+      success(`Answered question ${questionId}`);
+    } else {
+      success(`Question ${questionId} is no longer waiting; your reply was sent to your agent as a message`);
+    }
+  }
+}
 async function conversationList(client, json) {
   const conversations = await client.listConversations();
   if (json) {
@@ -2470,11 +2389,11 @@ async function conversationSend(client, id, messageParts, json) {
   }
   success(`Message sent (${msg.id})`);
 }
-async function conversationStream(client) {
+async function conversationStream(client, json) {
   info("Connecting to conversation stream...");
   dim(`Press Ctrl+C to stop.
 `);
-  const response = await client.streamConversationEvents();
+  const response = await client.streamEvents();
   if (!response.body) {
     error("No response body from stream endpoint.", 1);
     return;
@@ -2488,33 +2407,21 @@ async function conversationStream(client) {
       if (done)
         break;
       buffer += decoder.decode(value, { stream: true });
-      while (buffer.includes(`
-`)) {
-        const idx = buffer.indexOf(`
+      buffer = buffer.replace(/\r\n/g, `
+`);
+      const boundary = buffer.lastIndexOf(`
 `);
-        const raw2 = buffer.slice(0, idx);
-        buffer = buffer.slice(idx + 2);
-        for (const line of raw2.split(`
-`)) {
-          if (line.startsWith(":"))
-            continue;
-          if (!line.startsWith("data:"))
-            continue;
-          const jsonStr = line.slice("data:".length).trim();
-          if (!jsonStr)
-            continue;
-          try {
-            const event = JSON.parse(jsonStr);
-            const type = event.type;
-            if (type === "connected") {
-              success("Connected to conversation stream.");
-            } else {
-              dim(`[${type}] ${JSON.stringify(event)}`);
-            }
-          } catch {}
-        }
+      if (boundary < 0)
+        continue;
+      const complete = buffer.slice(0, boundary + 2);
+      buffer = buffer.slice(boundary + 2);
+      for (const event of parseSSEEvents(complete)) {
+        const data = JSON.parse(event.data);
+        if (json)
+          console.log(JSON.stringify({ event: event.event, data }));
+        else
+          dim(JSON.stringify(data));
       }
     }
   } finally {
@@ -2522,81 +2429,6 @@ async function conversationStream(client) {
   }
 }
-// src/contact.command.ts
-var CONTACT_HELP = `
-Usage:
-  index contact list             List your contacts
-  index contact remove <email>   Remove a contact
-`;
-async function handleContact(client, subcommand, positionals, options) {
-  if (!subcommand) {
-    if (options.json) {
-      console.log(JSON.stringify({ error: "No subcommand provided" }));
-    } else {
-      console.log(CONTACT_HELP);
-    }
-    return;
-  }
-  switch (subcommand) {
-    case "list": {
-      const result = await client.callTool("list_contacts", {});
-      if (options.json) {
-        console.log(JSON.stringify(result));
-        return;
-      }
-      if (!result.success) {
-        error(result.error ?? "Failed to list contacts", 1);
-        return;
-      }
-      const data = result.data;
-      heading("Contacts");
-      contactTable(data.contacts);
-      dim(`
-  ${data.count} contact${data.count !== 1 ? "s" : ""}`);
-      console.log();
-      return;
-    }
-    case "remove": {
-      const email = positionals[0];
-      if (!email) {
-        error("Missing email. Usage: index contact remove <email>", 1);
-        return;
-      }
-      const listResult = await client.callTool("list_contacts", {});
-      if (!listResult.success) {
-        error("Failed to resolve contact", 1);
-        return;
-      }
-      const contacts = listResult.data.contacts;
-      const match = contacts.find((c) => c.email.toLowerCase() === email.toLowerCase());
-      if (!match) {
-        error(`No contact found with email: ${email}`, 1);
-        return;
-      }
-      const result = await client.callTool("remove_contact", { contactUserId: match.userId });
-      if (options.json) {
-        console.log(JSON.stringify(result));
-        return;
-      }
-      if (!result.success) {
-        error(result.error ?? "Failed to remove contact", 1);
-        return;
-      }
-      success(`Removed ${email} from contacts.`);
-      return;
-    }
-    default: {
-      if (options.json) {
-        console.log(JSON.stringify({ error: `Unknown subcommand: ${subcommand}` }));
-      } else {
-        error(`Unknown subcommand: ${subcommand}`);
-        console.log(CONTACT_HELP);
-      }
-      return;
-    }
-  }
-}
 // src/scrape.command.ts
 async function handleScrape(client, positionals, options) {
   const url = positionals[0];
@@ -2606,20 +2438,15 @@ async function handleScrape(client, positionals, options) {
   }
   if (!options.json)
     info(`Scraping ${url}...`);
-  const result = await client.callTool("scrape_url", { url, objective: options.objective });
+  const result = await client.scrapeUrl(url, options.objective);
   if (options.json) {
     console.log(JSON.stringify(result));
     return;
   }
-  if (!result.success) {
-    error(result.error ?? "Scrape failed", 1);
-    return;
-  }
-  const data = result.data;
-  heading(`Content from ${data.url}`);
-  console.log(data.content);
+  heading(`Content from ${result.url}`);
+  console.log(result.content);
   dim(`
-  ${data.contentLength} characters extracted`);
+  ${result.contentLength} characters extracted`);
   console.log();
 }
@@ -2630,18 +2457,17 @@ import { join as join2 } from "node:path";
 async function handleSync(client, options) {
   if (!options.json)
     info("Syncing context...");
-  const [profile, networks, intents, contacts] = await Promise.all([
-    client.readUserContexts(),
-    client.callTool("read_networks", {}),
-    client.callTool("read_intents", {}),
-    client.callTool("list_contacts", {})
+  const me = await client.getMe();
+  const [profile, networks, intents] = await Promise.all([
+    client.getUser(me.id),
+    client.listNetworks(),
+    client.listIntents({ limit: 100 })
   ]);
   const context = {
     syncedAt: new Date().toISOString(),
-    profile: profile.success ? profile.data : null,
-    networks: networks.success ? networks.data : null,
-    intents: intents.success ? intents.data : null,
-    contacts: contacts.success ? contacts.data : null
+    profile,
+    networks,
+    intents: intents.intents
   };
   if (options.json) {
     console.log(JSON.stringify(context));
@@ -2653,190 +2479,109 @@ async function handleSync(client, options) {
   success("Context synced to ~/.index/context.json");
 }
-// src/onboarding.command.ts
-var ONBOARDING_HELP = `
-Onboarding Commands:
-  index onboarding complete   Mark onboarding as complete
-`;
-async function handleOnboarding(client, subcommand, options) {
-  if (subcommand === "complete") {
-    await onboardingComplete(client, options?.json);
-    return;
-  }
-  console.log(ONBOARDING_HELP);
-}
-async function onboardingComplete(client, json) {
-  if (!json) {
-    info("Completing onboarding...");
-  }
-  const result = await client.callTool("complete_onboarding", {});
+// src/docs.command.ts
+async function handleDocs(client, topic, json) {
+  const result = await client.readDocs(topic);
   if (json) {
     console.log(JSON.stringify(result));
     return;
   }
-  if (result.success) {
-    success("Onboarding marked as complete.");
+  console.log(result.content);
+  if (result.topics)
+    dim(`
+  Topics: ${result.topics.join(", ")}`);
+}
+// src/onboarding.command.ts
+async function handleOnboarding(client, subcommand, options) {
+  if (subcommand === "confirm-profile") {
+    const result = await client.confirmProfile();
+    if (options?.json) {
+      console.log(JSON.stringify(result));
+      return;
+    }
+    success("Profile confirmed.");
+  } else if (subcommand === "complete") {
+    const result = await client.completeOnboarding(options?.intentId);
+    if (options?.json) {
+      console.log(JSON.stringify(result));
+      return;
+    }
+    success(`Onboarding complete (first intent ${result.intentId}).`);
   } else {
-    error(result.error ?? "Failed to complete onboarding.");
+    throw new Error("Usage: index onboarding confirm-profile | complete [--intent-id <id>]");
   }
 }
 // src/main.ts
 var DEFAULT_API_URL = "https://protocol.index.network";
-var DEFAULT_APP_URL = "https://index.network";
-var VERSION = package_default.version;
-var BOX = { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│" };
-function visualLen(s) {
-  return stripAnsi(s).length;
-}
-function padVisual(s, width) {
-  return s + " ".repeat(Math.max(0, width - visualLen(s)));
-}
-function panel(title, rows) {
-  const innerW = Math.max(52, title.length + 4, ...rows.map((r) => visualLen(r)));
-  const dashRun = Math.max(1, innerW - title.length - 3);
-  const innerTop = `${BOX.h} ${title} ${BOX.h.repeat(dashRun)}`;
-  console.log(`${GRAY}${BOX.tl}${innerTop}${BOX.tr}${RESET}`);
-  for (const row of rows) {
-    console.log(`${GRAY}${BOX.v}${RESET}${padVisual(row, innerW)}${GRAY}${BOX.v}${RESET}`);
-  }
-  console.log(`${GRAY}${BOX.bl}${BOX.h.repeat(innerW)}${BOX.br}${RESET}
-`);
+var LOGIN_API_URLS = {
+  local: "http://localhost:3001",
+  dev: "https://protocol.dev.index.network",
+  prod: DEFAULT_API_URL
+};
+function webOriginForApi(apiUrl) {
+  const url = new URL(apiUrl);
+  if (url.hostname === "localhost" || url.hostname === "127.0.0.1") {
+    return `${url.protocol}//${url.hostname}:3000`;
+  }
+  const hostname = url.hostname.startsWith("protocol.") ? url.hostname.slice("protocol.".length) : url.hostname;
+  return `https://${hostname}`;
 }
-function helpRowDim(leftW, left, right) {
-  const pad = Math.max(0, leftW - left.length);
-  return ` ${GRAY}${left}${" ".repeat(pad)} ${right}${RESET}`;
-}
-function helpRowCmd(leftW, left, right) {
-  const pad = Math.max(0, leftW - left.length);
-  return ` ${BOLD}${CYAN}${left}${RESET}${" ".repeat(pad)} ${right}`;
-}
-function helpRowCont(leftW, right) {
-  return ` ${" ".repeat(leftW)} ${right}`;
-}
-function renderHelp() {
-  const gsLefts = [
-    "index login",
-    "index logout",
-    'index intent create "..."',
-    "index negotiation list",
-    "index opportunity list"
-  ];
-  const gsLW = Math.max(...gsLefts.map((s) => s.length));
-  const formsLefts = [
-    "index conversation list",
-    "index sync --json",
-    "index profile create",
-    "index profile update",
-    "index intent list",
-    "index negotiation list",
-    "index opportunity list"
-  ];
-  const formsLW = Math.max(...formsLefts.map((s) => s.length));
-  const cmdLefts = [
-    "pattern",
-    "example",
-    "intent",
-    "negotiation",
-    "opportunity",
-    "profile",
-    "conversation",
-    "network",
-    "contact",
-    "scrape",
-    "sync",
-    "onboarding"
-  ];
-  const cmdLW = Math.max(...cmdLefts.map((s) => s.length));
-  const optLefts = [
-    "--api-url <url>",
-    "--app-url <url>",
-    "--archived",
-    "--status <status>",
-    "--limit <n>",
-    "--since <date>",
-    "--json",
-    "--objective <text>",
-    "--linkedin <url>",
-    "--github <url>",
-    "--twitter <url>",
-    "--title <text>",
-    "--details <text>",
-    "--help",
-    "--version"
-  ];
-  const optLW = Math.max(...optLefts.map((s) => s.length));
-  console.log();
-  console.log(`  ${BOLD}${CYAN}I N D E X${RESET}  ${GRAY}cli${RESET}`);
-  console.log(`  ${GRAY}v${VERSION}${RESET}
-`);
-  panel("getting started", [
-    helpRowCmd(gsLW, "index login", "authenticate via browser"),
-    helpRowCmd(gsLW, "index logout", "clear stored session"),
-    helpRowCmd(gsLW, 'index intent create "..."', "describe what you're looking for"),
-    helpRowCmd(gsLW, "index negotiation list", "see agent debates in progress"),
-    helpRowCmd(gsLW, "index opportunity list", "see what was found for you")
-  ]);
-  panel("common forms", [
-    helpRowCmd(formsLW, "index conversation list", "list your conversations"),
-    helpRowCmd(formsLW, "index sync --json", "print synced context as JSON"),
-    "",
-    helpRowCmd(formsLW, "index profile create", "use social URL flags"),
-    helpRowCmd(formsLW, "index profile update", "use action text or --details"),
-    helpRowCmd(formsLW, "index intent list", "supports --archived and --limit"),
-    helpRowCmd(formsLW, "index negotiation list", "supports --since and --limit"),
-    helpRowCmd(formsLW, "index opportunity list", "supports --status and --limit")
-  ]);
-  panel("commands", [
-    helpRowDim(cmdLW, "pattern", "index <command> [args] [options]"),
-    helpRowDim(cmdLW, "example", 'index intent create "looking for a CTO"'),
-    "",
-    helpRowCmd(cmdLW, "intent", "list · show · create · update · archive"),
-    helpRowCont(cmdLW, "link · unlink · links"),
-    helpRowCmd(cmdLW, "negotiation", "list · show"),
-    "",
-    helpRowCmd(cmdLW, "profile", "show · sync · search · create · update"),
-    helpRowCmd(cmdLW, "conversation", "list · with · show · send · stream"),
-    helpRowCmd(cmdLW, "network", "list · create · show · update · delete"),
-    helpRowCont(cmdLW, "join · leave · invite"),
-    helpRowCmd(cmdLW, "contact", "list · remove"),
-    "",
-    helpRowCmd(cmdLW, "scrape", "extract content from a URL"),
-    helpRowCmd(cmdLW, "sync", "download your context locally"),
-    helpRowCmd(cmdLW, "onboarding", "finish account setup")
-  ]);
-  panel("options", [
-    helpRowDim(optLW, "--api-url <url>", "override API server URL"),
-    helpRowDim(optLW, "--app-url <url>", "override app URL for login"),
-    helpRowDim(optLW, "--archived", "include archived signals"),
-    helpRowDim(optLW, "--status <status>", "filter opportunities by status"),
-    helpRowDim(optLW, "--limit <n>", "limit number of results"),
-    helpRowDim(optLW, "--since <date>", "filter by ISO date or duration"),
-    helpRowDim(optLW, "--json", "output raw JSON"),
-    helpRowDim(optLW, "--objective <text>", "objective for scrape command"),
-    helpRowDim(optLW, "--linkedin <url>", "LinkedIn URL for profile create"),
-    helpRowDim(optLW, "--github <url>", "GitHub URL for profile create"),
-    helpRowDim(optLW, "--twitter <url>", "Twitter URL for profile create"),
-    helpRowDim(optLW, "--title <text>", "title for network update"),
-    helpRowDim(optLW, "--details <text>", "details for profile update"),
-    helpRowDim(optLW, "--help", "show help for any command"),
-    helpRowDim(optLW, "--version", "show version")
-  ]);
+var VERSION = package_default.version;
+function renderHelp(json) {
+  const help = `Usage: index <command> [args] [options]
+  login [local|dev|prod] [--app-url <url>] Authenticate through the matching web app
+  logout                             Revoke and clear the stored session
+  docs [topic]                       Read the protocol's canonical guidance
+  agent me                           Read your selected personal agent
+  profile [show <user-id>|sync|update] Read, research, or edit your profile
+  intent list|show|prepare|create|update|pause|resume|archive|networks|add-to-network|remove-from-network
+  network list|discover|requests|request-update|request-dismiss|show|create|update|delete|join|leave|invite
+  opportunity list|show|accept|reject|start-chat
+  negotiation list [--intent-id <id>] [--state open|settled]
+  negotiation show <opportunity-id>
+  negotiation turn <opportunity-id> --action propose|counter|accept|decline
+      --message <text> --expected-turn-count <n>
+  conversation list|with|show|send|answer|stream
+  conversation show agent --intent-id <id>
+  conversation send agent <text> --intent-id <id> [--question-id <id>]
+  onboarding confirm-profile
+  onboarding complete [--intent-id <id>]
+  scrape <url> [--objective <text>]
+  sync                               Download profile, networks, and intents
+Global options: --api-url <origin>, --json, --help, --version
+List options: --archived (intents), --status (opportunities), --limit <n>
+Intent list options: --query <text> (matches description and summary)
+Network options: --prompt <text> (create), --title <text> (update)
+Auth: INDEX_SESSION_TOKEN or INDEX_API_KEY, otherwise stored browser login.
+API origin: --api-url, INDEX_API_URL, stored login URL, production default.
+Login target: local (localhost:3001), dev (protocol.dev.index.network), prod (default).
+--json emits one result/error; conversation stream emits NDJSON events.`;
+  console.log(json ? JSON.stringify({ version: VERSION, help }) : `Index CLI ${VERSION}
+${help}`);
 }
 async function requireAuth(apiUrlOverride) {
   const store = new CredentialStore;
   const creds = await store.load();
-  if (!creds) {
-    error("Not logged in. Run `index login` first.", 1);
-    process.exit(1);
-  }
-  const apiUrl = apiUrlOverride ?? creds.apiUrl;
-  return new ApiClient(apiUrl, creds.token);
-}
-async function runLogin(apiUrlOverride, appUrlOverride) {
+  const session = process.env.INDEX_SESSION_TOKEN || undefined;
+  const apiKey = process.env.INDEX_API_KEY || undefined;
+  if (session && apiKey)
+    throw new Error("Set only one of INDEX_SESSION_TOKEN and INDEX_API_KEY");
+  const token = session ?? apiKey ?? creds?.token;
+  if (!token)
+    throw new Error("Not logged in. Run `index login` or set INDEX_SESSION_TOKEN or INDEX_API_KEY.");
+  const apiUrl = apiUrlOverride ?? process.env.INDEX_API_URL ?? creds?.apiUrl ?? DEFAULT_API_URL;
+  return new ApiClient(apiUrl, token, apiKey ? "apiKey" : "session");
+}
+async function runLogin(target, apiUrlOverride, appUrlOverride, json) {
   const store = new CredentialStore;
-  const apiUrl = apiUrlOverride ?? DEFAULT_API_URL;
-  const appUrl = appUrlOverride ?? DEFAULT_APP_URL;
+  const apiUrl = apiUrlOverride ?? (target ? LOGIN_API_URLS[target] : undefined) ?? process.env.INDEX_API_URL ?? (await store.load())?.apiUrl ?? DEFAULT_API_URL;
+  const appUrl = appUrlOverride ?? webOriginForApi(apiUrl);
   info(`Authenticating with ${apiUrl}...`);
   const { authUrl, callbackPromise } = await handleLogin(apiUrl, appUrl, store);
   info("Opening browser for authentication...");
@@ -2863,6 +2608,12 @@ async function runLogin(apiUrlOverride, appUrlOverride) {
   } catch {}
   dim("Waiting for authentication callback...");
   const result = await callbackPromise;
+  if (json) {
+    if (!result.success)
+      throw new Error(result.error ?? "Login failed.");
+    console.log(JSON.stringify(result));
+    return;
+  }
   if (result.success) {
     try {
       const creds = await store.load();
@@ -2880,8 +2631,14 @@ async function runLogin(apiUrlOverride, appUrlOverride) {
     error(result.error ?? "Login failed.", 1);
   }
 }
-async function runLogout() {
+async function runLogout(json) {
   const result = await handleLogout(new CredentialStore);
+  if (json) {
+    console.log(JSON.stringify(result));
+    if (!result.success)
+      process.exitCode = 1;
+    return;
+  }
   if (result.success) {
     success(result.message);
     return;
@@ -2893,30 +2650,44 @@ async function main() {
   const args = parseArgs(process.argv.slice(2));
   switch (args.command) {
     case "help":
-      renderHelp();
+      renderHelp(args.json);
       return;
     case "version":
-      console.log(VERSION);
+      console.log(args.json ? JSON.stringify({ version: VERSION }) : VERSION);
       return;
     case "unknown":
       error(`Unknown command: ${args.unknown}`, 1);
       return;
     case "login":
-      await runLogin(args.apiUrl, args.appUrl);
+      await runLogin(args.loginTarget, args.apiUrl, args.appUrl, args.json);
       return;
     case "logout":
-      await runLogout();
+      await runLogout(args.json);
       return;
   }
   const client = await requireAuth(args.apiUrl);
   switch (args.command) {
+    case "docs":
+      await handleDocs(client, args.positionals?.[0], args.json);
+      return;
+    case "agent": {
+      if (args.subcommand !== "me")
+        throw new Error("Usage: index agent me");
+      const selected = await client.getAgent();
+      if (args.json) {
+        console.log(JSON.stringify(selected));
+        return;
+      }
+      agentCard(selected);
+      return;
+    }
     case "profile":
       await handleProfile(client, args.subcommand, args.subcommand === "search" || args.subcommand === "update" ? args.positionals ?? [] : args.userId ? [args.userId] : [], {
         json: args.json,
-        linkedin: args.linkedin,
-        github: args.github,
-        twitter: args.twitter,
-        details: args.details
+        name: args.name,
+        intro: args.intro,
+        location: args.location,
+        socials: args.socials
       });
       return;
     case "intent":
@@ -2926,24 +2697,31 @@ async function main() {
         archived: args.archived,
         limit: args.limit,
         json: args.json,
-        targetId: args.targetId
+        targetId: args.targetId,
+        query: args.query,
+        receipt: args.receipt,
+        answers: args.answers
       });
       return;
     case "opportunity":
       await handleOpportunity(client, args.subcommand, {
         targetId: args.targetId,
         status: args.status,
+        statuses: args.statuses,
+        intentId: args.intentId,
         limit: args.limit,
         json: args.json,
-        positionals: args.positionals,
-        acknowledgeUptake: args.acknowledgeUptake
+        positionals: args.positionals
       });
       return;
     case "negotiation":
       await handleNegotiation(client, args.subcommand, {
         targetId: args.targetId,
-        limit: args.limit,
-        since: args.since,
+        intentId: args.intentId,
+        state: args.state,
+        action: args.action,
+        message: args.message,
+        expectedTurnCount: args.expectedTurnCount,
         json: args.json
       });
       return;
@@ -2957,12 +2735,10 @@ async function main() {
     case "conversation":
       await handleConversation(client, args.subcommand, args.positionals ?? [], {
         limit: args.limit,
-        json: args.json
-      });
-      return;
-    case "contact":
-      await handleContact(client, args.subcommand, args.positionals ?? [], {
-        json: args.json
+        json: args.json,
+        intentId: args.intentId,
+        questionId: args.questionId,
+        answers: args.answers
       });
       return;
     case "scrape":
@@ -2972,7 +2748,7 @@ async function main() {
       });
       return;
     case "onboarding":
-      await handleOnboarding(client, args.subcommand, { json: args.json });
+      await handleOnboarding(client, args.subcommand, { json: args.json, intentId: args.intentId });
       return;
     case "sync":
       await handleSync(client, { json: args.json });
@@ -2980,5 +2756,9 @@ async function main() {
   }
 }
 main().catch((err) => {
-  error(err instanceof Error ? err.message : String(err), 1);
+  if (process.argv.includes("--json")) {
+    console.log(JSON.stringify(err instanceof ApiError ? { error: err.message, status: err.status, response: err.response } : { error: err instanceof Error ? err.message : String(err) }));
+    process.exitCode = 1;
+  } else
+    error(err instanceof Error ? err.message : String(err), 1);
 });