shakers-cli 0.17.0 → 0.19.0

package/src/session-normalizers.js

@@ -26,8 +26,6 @@ function textFromParts(parts) {
 }
 
 // --- Codex (~/.codex/sessions/**/rollout-*.jsonl) ---
-// Reads timestamp, cwd (session_meta), user text, and shell commands; a record matching none
-// of those passes through only its own real timestamp/cwd, else is dropped.
 function codexCommand(args) {
   let a = args;
   if (typeof a === 'string') {
@@ -60,7 +58,15 @@ function normalizeCodexRecord(raw) {
   }
 
   const type = str(raw.type) || str(item.type);
+  if (type === 'turn_context' && item.collaboration_mode && item.collaboration_mode.mode === 'plan') {
+    out.planMode = true;
+    return out;
+  }
   const name = str(item.name) || (type === 'function_call' ? 'shell' : null);
+  if (name === 'update_plan') {
+    out.message = { content: [{ type: 'tool_use', name }] };
+    return out;
+  }
   if (name && /shell|exec|bash|terminal|command/i.test(name)) {
     const command = codexCommand(item.arguments ?? item.input ?? item.args);
     if (command) {
@@ -73,11 +79,16 @@ function normalizeCodexRecord(raw) {
 }
 
 // --- Gemini CLI (~/.gemini/tmp/<project-hash>/chats/logs.json | session-*.jsonl) ---
-// logs.json = JSON array of { type:'user'|'model', message, timestamp }; session-*.jsonl =
-// per-line { role, parts }. No cwd is recorded (the dir is a one-way SHA-256 hash), so cwd
-// stays null — global session/time metrics still count; per-repo scoping can't.
 function normalizeGeminiRecord(raw) {
   if (!raw || typeof raw !== 'object') return null;
+  if (Array.isArray(raw.messages)) {
+    const out = [];
+    for (const m of raw.messages) {
+      const o = normalizeGeminiRecord(m);
+      if (o) out.push(o);
+    }
+    return out;
+  }
   const out = {};
   const ts = str(raw.timestamp) || str(raw.time);
   if (ts) out.timestamp = ts;
@@ -91,6 +102,11 @@ function normalizeGeminiRecord(raw) {
       return out;
     }
   }
+  const calls = Array.isArray(raw.toolCalls) ? raw.toolCalls.map((c) => toolUse(c && c.name)).filter(Boolean) : [];
+  if (calls.length) {
+    out.message = { role: 'assistant', content: calls };
+    return out;
+  }
   return out.timestamp ? out : null;
 }
 
@@ -111,7 +127,7 @@ function normalizeContinueRecord(raw) {
     }
     return null;
   }
-  const out = [];
+  const out = str(raw.mode) === 'plan' ? [cwd ? { cwd, planMode: true } : { planMode: true }] : [];
   for (const entry of history) {
     const msg = entry && entry.message && typeof entry.message === 'object' ? entry.message : entry;
     if (!msg || typeof msg !== 'object') continue;
@@ -127,15 +143,30 @@ function normalizeContinueRecord(raw) {
 }
 
 // --- Cline / Roo Code: VS Code globalStorage .../tasks/<id>/api_conversation_history.json ---
-// One JSON array of Anthropic messages (role/content); no cwd and no timestamp in this file
-// (ui_messages.json has ts) → cwd/time attribution absent. Emits only real user turns.
 function normalizeClineRecord(raw) {
   if (!raw || typeof raw !== 'object') return null;
+  if (str(raw.role) === 'assistant') return clinePlanningTurn(raw.content);
   if (str(raw.role) !== 'user') return null;
   const text = typeof raw.content === 'string' ? raw.content.trim() : textFromParts(raw.content);
   return text ? oneUser(text, null, null) : null;
 }
 
+const CLINE_PLANNING_TAG = /<(plan_mode_respond|update_todo_list)>/g;
+
+function clinePlanningTurn(content) {
+  const blocks = typeof content === 'string' ? [{ type: 'text', text: content }] : (Array.isArray(content) ? content : []);
+  const calls = [];
+  for (const b of blocks) {
+    if (!b || typeof b !== 'object') continue;
+    if (b.type === 'tool_use') calls.push(toolUse(b.name));
+    else if (b.type === 'text' && typeof b.text === 'string') {
+      for (const m of b.text.matchAll(CLINE_PLANNING_TAG)) calls.push(toolUse(m[1]));
+    }
+  }
+  const uses = calls.filter(Boolean);
+  return uses.length ? { message: { role: 'assistant', content: uses } } : null;
+}
+
 // --- Aider: per-repo .aider.chat.history.md (markdown) ---
 // Repo-level source → cwd is the repo toplevel (good attribution). Markdown parse:
 // '# aider chat started at <ts>' sets the session time; '#### <text>' lines are user
@@ -158,6 +189,78 @@ function parseAiderHistory(text, cwd) {
   return out;
 }
 
+function normalizeClineSessionRecord(raw) {
+  if (!raw || typeof raw !== 'object' || !Array.isArray(raw.messages)) return null;
+  const out = [];
+  for (const m of raw.messages) {
+    if (!m || typeof m !== 'object') continue;
+    const ts = Number.isFinite(m.ts) ? new Date(m.ts).toISOString() : null;
+    if (str(m.role) === 'user') {
+      const text = textFromParts((Array.isArray(m.content) ? m.content : []).filter((b) => b && b.type === 'text'));
+      if (text) out.push(oneUser(text, null, ts));
+      continue;
+    }
+    if (str(m.role) !== 'assistant') continue;
+    const uses = (Array.isArray(m.content) ? m.content : []).filter((b) => b && b.type === 'tool_use').map((b) => toolUse(b.name)).filter(Boolean);
+    const o = ts ? { timestamp: ts } : {};
+    if (uses.length) o.message = { role: 'assistant', content: uses };
+    if (o.timestamp || o.message) out.push(o);
+  }
+  return out;
+}
+
+const CURSOR_QUERY = /^\s*<user_query>([\s\S]*?)<\/user_query>\s*$/;
+
+function normalizeCursorRecord(raw) {
+  if (!raw || typeof raw !== 'object' || !raw.message || !Array.isArray(raw.message.content)) return null;
+  const role = str(raw.role);
+  if (role === 'user') {
+    const text = textFromParts(raw.message.content.filter((b) => b && b.type === 'text').map((b) => {
+      const m = CURSOR_QUERY.exec(b.text || '');
+      return m ? m[1] : b.text;
+    }));
+    return text ? oneUser(text, null, null) : null;
+  }
+  if (role !== 'assistant') return null;
+  const uses = raw.message.content.filter((b) => b && b.type === 'tool_use' && str(b.name));
+  return uses.length ? { message: { role: 'assistant', content: uses } } : null;
+}
+
+function normalizePiRecord(raw) {
+  if (!raw || typeof raw !== 'object') return null;
+  const ts = str(raw.timestamp);
+  const type = str(raw.type);
+  if (type === 'session') {
+    const cwd = str(raw.cwd);
+    if (!cwd && !ts) return null;
+    const o = {};
+    if (cwd) o.cwd = cwd;
+    if (ts) o.timestamp = ts;
+    return o;
+  }
+  if (type === 'custom' && raw.customType === 'plan-mode' && raw.data && raw.data.enabled === true) {
+    return ts ? { timestamp: ts, planMode: true } : { planMode: true };
+  }
+  if (type !== 'message' || !raw.message || typeof raw.message !== 'object') return null;
+  const role = str(raw.message.role);
+  if (role === 'user') {
+    const text = textFromParts(raw.message.content);
+    return text ? oneUser(text, null, ts) : null;
+  }
+  if (role !== 'assistant') return ts ? { timestamp: ts } : null;
+  const uses = (Array.isArray(raw.message.content) ? raw.message.content : [])
+    .filter((b) => b && b.type === 'toolCall')
+    .map((b) => toolUse(b.name))
+    .filter(Boolean);
+  const o = ts ? { timestamp: ts } : {};
+  if (uses.length) o.message = { role: 'assistant', content: uses };
+  return o.timestamp || o.message ? o : null;
+}
+
+function toolUse(name) {
+  return typeof name === 'string' && name ? { type: 'tool_use', name } : null;
+}
+
 function oneUser(text, cwd, ts) {
   const o = { type: 'user', message: { role: 'user', content: [{ type: 'text', text }] } };
   if (cwd) o.cwd = cwd;
@@ -170,5 +273,8 @@ module.exports = {
   normalizeGeminiRecord,
   normalizeContinueRecord,
   normalizeClineRecord,
+  normalizeClineSessionRecord,
+  normalizeCursorRecord,
+  normalizePiRecord,
   parseAiderHistory,
 };

package/src/session-refresh.js

@@ -1,7 +1,5 @@
 'use strict';
 
-// On-demand hub-JWT minting for an email (better-auth) session.
-
 const REFRESH_MARGIN_MS = 120 * 1000;
 const REVOKED_STATUSES = new Set([401, 403]);
 
@@ -24,13 +22,13 @@ async function ensureFreshSession(env = process.env, deps = {}) {
 
   const session = loadAuthSession(env);
   if (!session) return null;
-  if (!session.cookie && !session.sessionToken) return session;
+  if (!session.sessionToken) return session;
   if (session.accessToken && jwtStillFresh(session.accessTokenExpiresAt, now, marginMs)) return session;
 
   const endpoint = getAuthTokenEndpoint(env);
   if (!endpoint) return session;
 
-  const tok = await requestAuthToken({ cookie: session.cookie, sessionToken: session.sessionToken }, { endpoint });
+  const tok = await requestAuthToken({ sessionToken: session.sessionToken }, { endpoint });
   if (!tok.ok && REVOKED_STATUSES.has(tok.status)) {
     clearAuthSession(env);
     return null;
@@ -44,7 +42,7 @@ async function ensureFreshSession(env = process.env, deps = {}) {
         accessToken: tok.accessToken,
         hubAccessToken: tok.accessToken,
         accessTokenExpiresAt: tok.expiresAt,
-        cookieExpiresAt: session.expiresAt,
+        sessionExpiresAt: session.expiresAt,
       },
       env,
     );
@@ -54,25 +52,16 @@ async function ensureFreshSession(env = process.env, deps = {}) {
   return loadAuthSession(env);
 }
 
-function webOrigin(url) {
-  try {
-    return new URL(url).origin;
-  } catch {
-    return null;
-  }
-}
-
 async function endSession(env = process.env, deps = {}) {
   const {
     loadAuthSession = require('./auth-session-store').loadAuthSession,
     clearAuthSession = require('./auth-session-store').clearAuthSession,
     getSignOutEndpoint = require('./config').getSignOutEndpoint,
-    getTalentProfileUrl = require('./config').getTalentProfileUrl,
     requestSignOut = require('./auth-client').requestSignOut,
   } = deps;
   const session = loadAuthSession(env);
-  if (session && (session.sessionToken || session.cookie)) {
-    await requestSignOut({ cookie: session.cookie, sessionToken: session.sessionToken }, { endpoint: getSignOutEndpoint(env), origin: webOrigin(getTalentProfileUrl(env)) });
+  if (session && session.sessionToken) {
+    await requestSignOut({ sessionToken: session.sessionToken }, { endpoint: getSignOutEndpoint(env) });
   }
   clearAuthSession(env);
   return session !== null;

package/src/session-scan.js

@@ -2,15 +2,19 @@
 
 const fs = require('fs');
 const path = require('path');
-const { getHomeDir } = require('./env-paths');
+const { getHomeDir, codexHome, piAgentDir, expandHome } = require('./env-paths');
 const { scrubSecrets } = require('./agent-synthesis');
 const {
   normalizeCodexRecord,
   normalizeGeminiRecord,
   normalizeContinueRecord,
   normalizeClineRecord,
+  normalizeClineSessionRecord,
+  normalizeCursorRecord,
+  normalizePiRecord,
   parseAiderHistory,
 } = require('./session-normalizers');
+const { readOpencodeSessions } = require('./opencode-sessions');
 
 // GLOBAL, machine-wide inventory of AI coding-tool SESSIONS.
 
@@ -78,11 +82,130 @@ const FILE_TOOL_NAMES = new Set([
   'Write',
   'NotebookEdit',
 ]);
-const PLANNING_TOOL_NAMES = new Set(['ExitPlanMode', 'TodoWrite']);
+const PLANNING_TOOL_NAMES = new Set([
+  'ExitPlanMode',
+  'TodoWrite',
+  'update_plan',
+  'write_todos',
+  'enter_plan_mode',
+  'exit_plan_mode',
+  'tracker_create_task',
+  'tracker_update_task',
+  'update_todo_list',
+  'plan_mode_respond',
+  'todowrite',
+  'todo',
+]);
 
 // Only logs.json + session-*.jsonl under ~/.gemini/tmp are transcripts (skip checkpoints/config).
 function isGeminiTranscriptFile(name) {
-  return name === 'logs.json' || (name.startsWith('session-') && name.endsWith('.jsonl'));
+  return name === 'logs.json' || (name.startsWith('session-') && (name.endsWith('.jsonl') || name.endsWith('.json')));
+}
+
+function isCursorTranscriptFile(name, full) {
+  return name.endsWith('.jsonl') && full.split(path.sep).includes('agent-transcripts');
+}
+
+function isClineSessionFile(name) {
+  return name.endsWith('.messages.json');
+}
+
+function readJsonFile(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function geminiContext(geminiDir) {
+  let slugs = null;
+  return (file) => {
+    if (slugs === null) {
+      slugs = new Map();
+      const registry = readJsonFile(path.join(geminiDir, 'projects.json'));
+      const projects = registry && registry.projects && typeof registry.projects === 'object' ? registry.projects : {};
+      for (const [dir, slug] of Object.entries(projects)) {
+        if (typeof slug === 'string') slugs.set(slug, dir);
+      }
+    }
+    const slug = path.relative(path.join(geminiDir, 'tmp'), file).split(path.sep)[0];
+    const cwd = slugs.get(slug);
+    return cwd ? { cwd } : null;
+  };
+}
+
+function slugOf(name) {
+  return name.replace(/[^A-Za-z0-9]/g, '-');
+}
+
+function resolveSlugPath(slug, dir = path.parse(process.cwd()).root, depth = 0) {
+  if (!slug) return dir;
+  if (depth > 24) return null;
+  let entries;
+  try {
+    entries = fs.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  for (const e of entries) {
+    if (!e.isDirectory()) continue;
+    const part = slugOf(e.name);
+    if (slug === part) return path.join(dir, e.name);
+    if (part && slug.startsWith(`${part}-`)) {
+      const hit = resolveSlugPath(slug.slice(part.length + 1), path.join(dir, e.name), depth + 1);
+      if (hit) return hit;
+    }
+  }
+  return null;
+}
+
+function cursorContext(projectsDir) {
+  const cwds = new Map();
+  return (file) => {
+    const slug = path.relative(projectsDir, file).split(path.sep)[0];
+    if (!cwds.has(slug)) cwds.set(slug, resolveSlugPath(slug));
+    const out = {};
+    const cwd = cwds.get(slug);
+    if (cwd) out.cwd = cwd;
+    try {
+      out.timestamp = fs.statSync(file).mtime.toISOString();
+    } catch {
+      return cwd ? out : null;
+    }
+    return out;
+  };
+}
+
+function clineSessionStem(file) {
+  return path.basename(file).slice(0, -'.messages.json'.length);
+}
+
+function isClineSubagentFile(file) {
+  return clineSessionStem(file) !== path.basename(path.dirname(file));
+}
+
+function clineContext(file) {
+  if (isClineSubagentFile(file)) return null;
+  const manifest = readJsonFile(path.join(path.dirname(file), `${clineSessionStem(file)}.json`));
+  if (!manifest || typeof manifest !== 'object') return null;
+  const out = {};
+  const cwd = manifest.cwd || manifest.workspace_root;
+  if (typeof cwd === 'string' && cwd) out.cwd = cwd;
+  if (typeof manifest.started_at === 'string') out.timestamp = manifest.started_at;
+  if (manifest.metadata && manifest.metadata.mode === 'plan') out.planMode = true;
+  return Object.keys(out).length ? out : null;
+}
+
+function clineSessionsDir(env, home) {
+  if (env.CLINE_SESSION_DATA_DIR) return env.CLINE_SESSION_DATA_DIR;
+  const dataDir = env.CLINE_DATA_DIR || path.join(env.CLINE_DIR || path.join(home, '.cline'), 'data');
+  return path.join(dataDir, 'sessions');
+}
+
+function piSessionsDir(env) {
+  if (env.PI_CODING_AGENT_SESSION_DIR) return expandHome(env.PI_CODING_AGENT_SESSION_DIR, env);
+  return path.join(piAgentDir(env), 'sessions');
 }
 
 // Cline / Roo Code conversation file (both forks use this filename under tasks/<id>/).
@@ -99,14 +222,18 @@ function vscodeGlobalStorageDir(home) {
 
 function toolSources(env = process.env) {
   const home = getHomeDir(env);
+  const codex = codexHome(env);
+  const gemini = path.join(home, '.gemini');
+  const cursorProjects = path.join(home, '.cursor', 'projects');
   return [
-    { tool: 'claude', dir: path.join(home, '.claude', 'projects') },
-    { tool: 'codex', dir: path.join(home, '.codex', 'sessions'), normalize: normalizeCodexRecord },
-    { tool: 'gemini', dir: path.join(home, '.gemini', 'tmp'), fileFilter: isGeminiTranscriptFile, normalize: normalizeGeminiRecord },
-    // Kept by decision: ~/.cursor/chats is OBSOLETE (real Cursor chat is SQLite in App Support); awaiting a future SQLite extractor, no tool removed.
-    { tool: 'cursor', dir: path.join(home, '.cursor', 'chats') },
-    { tool: 'continue', dir: path.join(home, '.continue', 'sessions'), normalize: normalizeContinueRecord },
-    { tool: 'cline', dir: vscodeGlobalStorageDir(home), fileFilter: isClineHistoryFile, normalize: normalizeClineRecord },
+    { tool: 'claude', dirs: [path.join(home, '.claude', 'projects')] },
+    { tool: 'codex', dirs: [path.join(codex, 'sessions'), path.join(codex, 'archived_sessions')], normalize: normalizeCodexRecord },
+    { tool: 'gemini', dirs: [path.join(gemini, 'tmp')], fileFilter: isGeminiTranscriptFile, normalize: normalizeGeminiRecord, context: geminiContext(gemini) },
+    { tool: 'cursor', dirs: [cursorProjects], fileFilter: isCursorTranscriptFile, normalize: normalizeCursorRecord, context: cursorContext(cursorProjects) },
+    { tool: 'continue', dirs: [path.join(home, '.continue', 'sessions')], normalize: normalizeContinueRecord },
+    { tool: 'cline', dirs: [vscodeGlobalStorageDir(home), clineSessionsDir(env, home)], fileFilter: (name) => isClineHistoryFile(name) || isClineSessionFile(name), normalize: (r) => normalizeClineSessionRecord(r) || normalizeClineRecord(r), context: (file) => (isClineSessionFile(path.basename(file)) ? clineContext(file) : null), subagent: (file) => isSubagentFile(file) || (isClineSessionFile(path.basename(file)) && isClineSubagentFile(file)) },
+    { tool: 'pi', dirs: [piSessionsDir(env)], normalize: normalizePiRecord },
+    { tool: 'opencode', sessions: () => readOpencodeSessions(env, MAX_FILES_PER_TOOL) },
     // Repo-level: .aider.chat.history.md lives INSIDE each git repo, so cwd = the repo toplevel.
     { tool: 'aider', repoLevel: true, file: '.aider.chat.history.md', parseText: parseAiderHistory },
   ];
@@ -127,7 +254,7 @@ function listSessionFiles(root, fileFilter = isTranscriptFile) {
       const full = path.join(dir, entry.name);
       if (entry.isDirectory()) {
         stack.push(full);
-      } else if (entry.isFile() && fileFilter(entry.name)) {
+      } else if (entry.isFile() && fileFilter(entry.name, full)) {
         out.push(full);
         if (out.length >= MAX_FILES_PER_TOOL) return out;
       }
@@ -169,7 +296,8 @@ function parseRawRecords(file) {
 function readSourceObjects(source, file) {
   const raw = parseRawRecords(file);
   if (typeof source.normalize !== 'function') return raw;
-  const out = [];
+  const context = typeof source.context === 'function' ? source.context(file) : null;
+  const out = context ? [context] : [];
   for (const r of raw) {
     const o = source.normalize(r);
     if (Array.isArray(o)) out.push(...o);
@@ -178,6 +306,26 @@ function readSourceObjects(source, file) {
   return out;
 }
 
+function listSourceFiles(source) {
+  const out = [];
+  for (const dir of source.dirs) {
+    out.push(...listSessionFiles(dir, source.fileFilter || isTranscriptFile));
+    if (out.length >= MAX_FILES_PER_TOOL) return out.slice(0, MAX_FILES_PER_TOOL);
+  }
+  return out;
+}
+
+function* sourceSessions(source) {
+  if (typeof source.sessions === 'function') {
+    yield* source.sessions();
+    return;
+  }
+  const subagent = source.subagent || isSubagentFile;
+  for (const file of listSourceFiles(source)) {
+    yield { file, objects: readSourceObjects(source, file), subagent: subagent(file) };
+  }
+}
+
 // Bounded whole-file text read (for repo-level markdown sources, e.g. Aider).
 function readTextFile(file) {
   let fd;
@@ -304,9 +452,7 @@ function* iterateSessionObjects(env = process.env) {
   const seenCwds = new Set();
   for (const source of sources) {
     if (source.repoLevel) continue;
-    const files = listSessionFiles(source.dir, source.fileFilter || isTranscriptFile);
-    for (const file of files) {
-      const objects = readSourceObjects(source, file);
+    for (const { file, objects } of sourceSessions(source)) {
       const cwd = resolveFileCwd(objects);
       if (cwd) seenCwds.add(cwd);
       for (const obj of objects) {
@@ -360,9 +506,10 @@ function makeSessionsAccumulator() {
         },
       };
     },
-    addFile(file, objects) {
+    addFile(file, objects, subagent = isSubagentFile(file)) {
       for (const o of objects) harvestObject(o, cur.acc);
-      if (isSubagentFile(file)) {
+      if (objects.some((o) => o && o.planMode === true)) cur.acc.planningSignalCount += 1;
+      if (subagent) {
         cur.subagentRuns += 1;
       } else {
         cur.rootSessions += 1;
@@ -424,15 +571,12 @@ function walkSessionSignals(env = process.env, selectedCwds = null, onHumanObjec
   // Phase 1: home-dir sources; remember the repo toplevels (cwds) they reveal.
   for (const source of sources) {
     if (source.repoLevel) continue;
-    const files = listSessionFiles(source.dir, source.fileFilter || isTranscriptFile);
-    if (files.length === 0) continue;
     sessions.startTool(source.tool);
-    for (const f of files) {
-      const objects = readSourceObjects(source, f);
+    for (const { file, objects, subagent } of sourceSessions(source)) {
       const cwd = resolveFileCwd(objects);
       if (cwd) seenCwds.add(cwd);
       if (!fileInScope(cwd, selectedCwds)) continue;
-      sessions.addFile(f, objects);
+      sessions.addFile(file, objects, subagent);
       if (onHumanObject) {
         for (const o of objects) onHumanObject(o);
       }
@@ -468,6 +612,7 @@ module.exports = {
   makeSessionsAccumulator,
   walkSessionSignals,
   toolSources,
+  sourceSessions,
   listSessionFiles,
   readSessionObjects,
   resolveFileCwd,

package/src/share-payload.js

@@ -48,7 +48,9 @@ function agentDefinitionsByName(report) {
   return byName;
 }
 
-function derivePayload(report, maturity) {
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+function derivePayload(report, maturity, { cliCommandId = null } = {}) {
   const agents = Array.isArray(report.agents) ? report.agents : [];
   const catalogIdsByName = agentCatalogIdsByName(report);
   const definitionsByName = agentDefinitionsByName(report);
@@ -141,6 +143,7 @@ function derivePayload(report, maturity) {
     decisions: whitelistDecisions(report.decisions),
     // PER-CANDIDATE authorship + depth (per detected skill, per detected agent).
     detectionEvidence: whitelistDetectionEvidence(report.detectionEvidence),
+    ...(typeof cliCommandId === 'string' && UUID_RE.test(cliCommandId) ? { cliCommandId } : {}),
   };
 }
 

package/src/share.js

@@ -43,7 +43,7 @@ async function requestJsonBackend(endpoint, body, { timeoutMs = 15000, idempoten
 
 /* ---------- automatic sending ---------- */
 
-async function autoShare(report, maturity, { root, bypassThrottle = false } = {}) {
+async function autoShare(report, maturity, { root, bypassThrottle = false, cliCommandId = null } = {}) {
   const state = loadConsentState();
   const decision = getConsentDecision(state);
 
@@ -67,7 +67,7 @@ async function autoShare(report, maturity, { root, bypassThrottle = false } = {}
     return { ok: false, skipped: true, reason: 'no-endpoint-configured' };
   }
 
-  const payload = derivePayload(report, maturity);
+  const payload = derivePayload(report, maturity, { cliCommandId });
 
   const idempotencyKey = crypto.randomUUID();
   let res;

package/src/signup-client.js

@@ -1,11 +1,8 @@
 'use strict';
 
-const { postJsonWithTimeout, extractSetCookie } = require('./backend-request');
-const { SESSION_COOKIE_NAME } = require('./auth-client');
+const { postJsonWithTimeout } = require('./backend-request');
 const { toUpperLang } = require('./lang-codes');
 
-// Register a talent via the Hub's better-auth email engine, in two steps (WEB-login parity): 1.
-
 const DEFAULT_TIMEOUT_MS = 30000;
 
 function parseJson(raw) {
@@ -29,6 +26,12 @@ function buildRegistrationContext({ preferredLanguage, newsletterConsent, freela
   return context;
 }
 
+const TERMS_VERSION = '2026-10-22';
+
+function buildRegistrationConsent({ newsletterConsent } = {}) {
+  return { termsAccepted: true, termsVersion: TERMS_VERSION, newsletterConsent: newsletterConsent === true };
+}
+
 // Hub refuses these claims with a coded error and creates nothing, so registering without the code is safe.
 const UNCLAIMABLE_CODES = new Set(['auth-engine.claim_code_invalid', 'users.unregistered_talent_not_claimable']);
 
@@ -53,13 +56,14 @@ async function postCompleteRegistration(body, { endpoint, headers, timeoutMs })
 // Shared complete-registration call. With a claimCode it claims the MCP sign-up's UNREGISTERED profile; an unclaimable code still registers the account, with claimed:false.
 async function requestCompleteRegistration(
   context = {},
-  { endpoint, cookie = null, bearerToken = null, claimCode = null, timeoutMs = DEFAULT_TIMEOUT_MS } = {},
+  { endpoint, bearerToken = null, claimCode = null, consent = null, timeoutMs = DEFAULT_TIMEOUT_MS } = {},
 ) {
   if (!endpoint) return { ok: false, reason: 'no-endpoint' };
   const headers = {};
-  if (cookie) headers.Cookie = cookie;
   if (bearerToken) headers.Authorization = `Bearer ${bearerToken}`;
-  const base = { userType: 'WORKS_TALENT', context };
+  const base = consent && consent.termsAccepted === true
+    ? { userType: 'WORKS_TALENT', context, consent }
+    : { userType: 'WORKS_TALENT', context };
   if (typeof claimCode !== 'string' || !claimCode) return postCompleteRegistration(base, { endpoint, headers, timeoutMs });
 
   const claimed = await postCompleteRegistration({ ...base, claimCode }, { endpoint, headers, timeoutMs });
@@ -69,35 +73,4 @@ async function requestCompleteRegistration(
   return plain.ok ? { ok: true, claimed: false, claimError: claimed.code } : plain;
 }
 
-async function requestSignUp(
-  { name, lastName, email, password, preferredLanguage, newsletterConsent, freelanceType, freelanceIntent, claimCode = null } = {},
-  { signUpEndpoint, completeRegistrationEndpoint, timeoutMs = DEFAULT_TIMEOUT_MS } = {},
-) {
-  if (!signUpEndpoint) return { ok: false, reason: 'no-endpoint' };
-  if (!name || !lastName || !email || !password) return { ok: false, reason: 'missing-fields' };
-
-  let signUp;
-  try {
-    signUp = await postJsonWithTimeout(signUpEndpoint, { email, password, name, lastName }, timeoutMs);
-  } catch (e) {
-    return { ok: false, reason: (e && e.kind) || 'network-error' };
-  }
-
-  // A duplicate email is a normal outcome the caller handles by switching to login.
-  if (signUp.status === 409 || signUp.status === 422) return { ok: true, accountExists: true };
-  if (signUp.status < 200 || signUp.status >= 300) {
-    return { ok: false, reason: `http-${signUp.status}`, status: signUp.status, message: messageFrom(signUp.raw) };
-  }
-
-  const cookie = extractSetCookie(signUp.headers, SESSION_COOKIE_NAME);
-  if (!cookie) return { ok: false, reason: 'bad-response' };
-
-  if (!completeRegistrationEndpoint) return { ok: false, reason: 'no-endpoint' };
-
-  const context = buildRegistrationContext({ preferredLanguage, newsletterConsent, freelanceType, freelanceIntent });
-  const complete = await requestCompleteRegistration(context, { endpoint: completeRegistrationEndpoint, cookie, claimCode, timeoutMs });
-  if (!complete.ok) return complete;
-  return claimCode ? { ok: true, accountExists: false, claimed: complete.claimed === true } : { ok: true, accountExists: false };
-}
-
-module.exports = { requestSignUp, requestCompleteRegistration, buildRegistrationContext };
+module.exports = { requestCompleteRegistration, buildRegistrationContext, buildRegistrationConsent, TERMS_VERSION };