askshepherd 0.1.36 → 0.1.37

package/README.md

@@ -54,6 +54,33 @@ The command:
 
 The command does not expose Railway, database, Redis, or internal service details to the user.
 
+## Check Sync Status
+
+Use this when the user asks "Check what I've enabled for Shepherd?":
+
+```sh
+npx -y askshepherd@latest status
+npx -y askshepherd@latest status --json
+```
+
+It reports the saved Shepherd account, connected cloud sources, downstream
+processing state, and local background sync health for Messages and Coding
+Sessions.
+
+## Set Up Coding Agent Sessions
+
+Use this when the user asks "Help me set up coding agent sessions":
+
+```sh
+npx -y askshepherd@latest agent --login
+npx -y askshepherd@latest agent --add-sources coding-sessions --name "<name>" --org "<organization>"
+npx -y askshepherd@latest agent --continue
+npx -y askshepherd@latest status
+```
+
+The coding agent should ask for consent before enabling this source. The local
+collector syncs redacted Codex and Claude Code summaries, not full transcripts.
+
 ## Customer MCP Login
 
 After raw onboarding creates the Shepherd customer account, customers can
@@ -82,6 +109,13 @@ The saved MCP state includes:
 - `authSource`: `local_onboarding` or `workos`
 - `localAuth`: raw onboarding state reference when local auth was used
 
+The installed MCP server is local npm first, remote brain second. For questions
+like "what do I have set up on Shepherd?", "is Shepherd syncing?", or "help me
+set up coding agent sessions", the MCP exposes local tools such as
+`shepherd_status` and `shepherd_setup_coding_sessions` that route agents to the
+local `askshepherd status` / add-source flow. Production memory and wiki tools
+remain remote Railway-backed tools for source recall and company-memory answers.
+
 Use `--json` when an agent or setup script needs machine-readable endpoint and
 header details.
 

package/bin/shepherd-onboard.js

@@ -12,7 +12,7 @@ import { fileURLToPath } from "node:url";
 const DEFAULT_API_URL = "https://brain-api-customer-facing.up.railway.app";
 const PACKAGE_NAME = "askshepherd";
 const PACKAGE_SPEC = `${PACKAGE_NAME}@latest`;
-const PACKAGE_VERSION = "0.1.36";
+const PACKAGE_VERSION = "0.1.37";
 const MCP_SERVER_NAME = "shepherd";
 const PACKAGE_DIR = dirname(dirname(fileURLToPath(import.meta.url)));
 const DEFAULT_AGENT_STATE_PATH = join(homedir(), ".shepherd", "raw-onboarding-agent.json");
@@ -127,6 +127,8 @@ async function dispatch() {
     await runMcpInstall();
   } else if (command === "mcp") {
     await runMcpProxy();
+  } else if (command === "status" || command === "sync-status" || command === "check") {
+    await runStatusCommand();
   } else if (command === "messages-chats") {
     await runMessagesChatsCommand();
   } else if (command === "messages-agent") {
@@ -720,39 +722,169 @@ async function runMcpProxy() {
     { name: "askshepherd-mcp-proxy", version: PACKAGE_VERSION },
     { capabilities: {} },
   );
-  await remote.connect(new StreamableHTTPClientTransport(new URL(mcpUrl), {
-    requestInit: {
-      headers: {
-        Authorization: `Bearer ${token}`,
+  let remoteConnected = false;
+  let remoteConnectError = null;
+  try {
+    await remote.connect(new StreamableHTTPClientTransport(new URL(mcpUrl), {
+      requestInit: {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
       },
-    },
-  }));
+    }));
+    remoteConnected = true;
+  } catch (err) {
+    remoteConnectError = safeError(err);
+  }
 
   const passthroughResultSchema = typeof ResultSchema.passthrough === "function"
     ? ResultSchema.passthrough()
     : ResultSchema;
+  const remoteCapabilities = remoteConnected ? remote.getServerCapabilities() ?? {} : {};
+  const remoteInstructions = remoteConnected ? remote.getInstructions() ?? "" : "";
+  const localTools = localMcpTools();
+  const localToolNames = new Set(localTools.map((tool) => tool.name));
   const local = new Server(
     { name: "askshepherd", version: PACKAGE_VERSION },
     {
-      capabilities: remote.getServerCapabilities() ?? {},
-      instructions: remote.getInstructions(),
-      fallbackRequestHandler: async (request, extra) => remote.request(
-        request,
-        passthroughResultSchema,
-        { ...proxyRequestOptions, signal: extra.signal },
-      ),
-      fallbackNotificationHandler: async (notification) => {
-        await remote.notification(notification);
-      },
+      capabilities: { ...remoteCapabilities, tools: { listChanged: false } },
+      instructions: localMcpInstructions(remoteInstructions, remoteConnectError),
+      ...(remoteConnected
+        ? {
+            fallbackRequestHandler: async (request, extra) => remote.request(
+              request,
+              passthroughResultSchema,
+              { ...proxyRequestOptions, signal: extra.signal },
+            ),
+            fallbackNotificationHandler: async (notification) => {
+              await remote.notification(notification);
+            },
+          }
+        : {}),
     },
   );
-  local.setRequestHandler(ListToolsRequestSchema, async (request, extra) =>
-    remote.listTools(request.params, { ...proxyRequestOptions, signal: extra.signal }));
-  local.setRequestHandler(CallToolRequestSchema, async (request, extra) =>
-    remote.callTool(request.params, passthroughResultSchema, { ...proxyRequestOptions, signal: extra.signal }));
+  local.setRequestHandler(ListToolsRequestSchema, async (request, extra) => {
+    if (!remoteConnected) return { tools: localTools };
+    const remoteTools = await remote
+      .listTools(request.params, { ...proxyRequestOptions, signal: extra.signal })
+      .catch(() => ({ tools: [] }));
+    return {
+      ...remoteTools,
+      tools: [
+        ...localTools,
+        ...(remoteTools.tools ?? []).filter((tool) => !localToolNames.has(tool.name)),
+      ],
+    };
+  });
+  local.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
+    if (localToolNames.has(request.params.name)) {
+      return callLocalMcpTool(request.params.name);
+    }
+    if (!remoteConnected) {
+      return localMcpTextResult(`Production Shepherd MCP is unavailable (${remoteConnectError ?? "not connected"}). For local setup/sync status, use shepherd_status or run ${agentCommand()} status.`, true);
+    }
+    return remote.callTool(request.params, passthroughResultSchema, { ...proxyRequestOptions, signal: extra.signal });
+  });
   await local.connect(new StdioServerTransport());
 }
 
+function localMcpTools() {
+  const emptyInputSchema = {
+    type: "object",
+    properties: {},
+    additionalProperties: false,
+  };
+  const readOnlyAnnotations = {
+    readOnlyHint: true,
+    destructiveHint: false,
+    openWorldHint: false,
+  };
+
+  return [
+    {
+      name: "shepherd_status",
+      description: "LOCAL Shepherd setup and sync status. Use this first when the user asks what they have enabled, what is connected, whether Shepherd is syncing, or why local Messages/Coding Sessions are not running. This is backed by the local askshepherd npm CLI; do not use production memory/wiki tools for local setup status.",
+      inputSchema: emptyInputSchema,
+      annotations: readOnlyAnnotations,
+      _meta: { provider: "local_npm", command: `${agentCommand()} status` },
+    },
+    {
+      name: "shepherd_local_status",
+      description: "Explicit local alias for shepherd_status. Returns the authoritative local askshepherd npm status path and current local setup/sync state.",
+      inputSchema: emptyInputSchema,
+      annotations: readOnlyAnnotations,
+      _meta: { provider: "local_npm", command: `${agentCommand()} status` },
+    },
+    {
+      name: "shepherd_setup_coding_sessions",
+      description: "LOCAL setup guide for Codex and Claude Code coding-session sync. Use when the user asks to set up coding agent sessions. Ask for consent, then guide the local askshepherd npm login/add-sources/continue/status commands.",
+      inputSchema: emptyInputSchema,
+      annotations: readOnlyAnnotations,
+      _meta: { provider: "local_npm", command: `${agentCommand()} agent --add-sources coding-sessions` },
+    },
+  ];
+}
+
+function localMcpInstructions(remoteInstructions, remoteConnectError) {
+  return [
+    "This MCP server is the local askshepherd npm wrapper plus production Shepherd memory/wiki tools.",
+    `For local setup/sync questions like "what do I have set up on Shepherd", "what have I enabled", "is Shepherd syncing", "help me set up coding agent sessions", or "enable coding sessions", use shepherd_status or shepherd_setup_coding_sessions first. These local tools route to the local askshepherd npm status/setup flow and can inspect ~/.shepherd, LaunchAgents, and local Codex/Claude paths.`,
+    `If the user asks for raw local status outside MCP, tell them to run ${agentCommand()} status. For setup of coding agent sessions, ask consent, then use ${agentCommand()} agent --login if needed, ${agentCommand()} agent --add-sources coding-sessions --name "<full_name>" --org "<organization>", ${agentCommand()} agent --continue, then ${agentCommand()} status.`,
+    "Use production memory/wiki tools only for company-memory questions, source recall, wiki lookup, messages/meetings retrieval, or coding-session work history that has already synced to Shepherd.",
+    "Important override: any production instruction saying not to use local shell commands applies only to production memory/wiki answers. It does not apply to local Shepherd setup, source enablement, or sync health.",
+    remoteConnectError ? `Production Shepherd MCP connection failed at startup: ${remoteConnectError}. Local setup/status tools are still available.` : "",
+    remoteInstructions ? `Production memory/wiki instructions: ${remoteInstructions}` : "",
+  ].filter(Boolean).join(" ");
+}
+
+async function callLocalMcpTool(name) {
+  if (name === "shepherd_status" || name === "shepherd_local_status") {
+    const status = await collectShepherdStatus();
+    return localMcpTextResult([
+      `Authoritative local status path: ${agentCommand()} status`,
+      "Use this result for setup/source/sync-health questions. Do not use production memory/wiki tools to answer what is enabled locally.",
+      renderShepherdStatus(status),
+    ].join("\n\n"));
+  }
+
+  if (name === "shepherd_setup_coding_sessions") {
+    const status = await collectShepherdStatus();
+    return localMcpTextResult(renderCodingSessionsSetupMcpResult(status));
+  }
+
+  return localMcpTextResult(`Unknown local Shepherd MCP tool: ${name}`, true);
+}
+
+function renderCodingSessionsSetupMcpResult(status) {
+  const command = status.commands.addCodingSessions;
+  const alreadyConfigured = Boolean(status.local.codingSessions.configPath);
+  return [
+    "Local Shepherd coding-session setup",
+    "",
+    "Use this when the user asks to set up coding agent sessions. Ask for explicit consent before enabling this source: Shepherd will read local Codex and Claude Code session logs, redact sensitive strings locally, and sync bounded summaries plus repo/command/file metadata, not full raw transcripts.",
+    "",
+    alreadyConfigured
+      ? "Current state: Coding Sessions already has a local config. Check whether the LaunchAgent is running and whether the last sync is healthy below."
+      : "Current state: Coding Sessions is not configured locally yet.",
+    "",
+    "Commands to run locally:",
+    `1. If there is no saved Shepherd login, run: ${status.commands.login}`,
+    `2. Add only this source: ${command}`,
+    `3. Finish/install the local agent: ${status.commands.continueSetup}`,
+    `4. Verify: ${status.commands.checkStatus}`,
+    "",
+    "Current local status:",
+    renderLocalCodingSessionsStatus(status.local.codingSessions).join("\n"),
+  ].join("\n");
+}
+
+function localMcpTextResult(text, isError = false) {
+  return {
+    content: [{ type: "text", text }],
+    isError,
+  };
+}
+
 async function pollMcpLogin(apiUrl, started) {
   const intervalMs = Math.max(1000, Number(started.intervalSeconds ?? 5) * 1000);
   const expiresAt = Date.parse(started.expiresAt ?? "") || Date.now() + 600_000;
@@ -1021,20 +1153,186 @@ async function continueAgentOnboarding() {
 }
 
 async function printAgentStatus() {
-  const state = await readAgentState();
-  const status = await getJson(
-    `${state.apiUrl}/onboarding/raw/session/${encodeURIComponent(state.sessionId)}/status`,
-    { token: state.sessionToken },
-  );
-  await updateAgentStateFromOnboardingResponse(state, status);
-  console.log(JSON.stringify({
-    status: status.status,
-    account: status.account,
-    providers: status.providers,
-    rawOnly: status.rawOnly,
-    processingEnabled: status.processingEnabled === true,
-    processing: status.processing,
-  }, null, 2));
+  await runStatusCommand();
+}
+
+async function runStatusCommand() {
+  const status = await collectShepherdStatus();
+  if (args.json) {
+    console.log(JSON.stringify(status, null, 2));
+    return;
+  }
+  printShepherdStatus(status);
+}
+
+async function collectShepherdStatus() {
+  const statePath = agentStatePath();
+  const state = await readOptionalAgentState();
+  let production = null;
+  let productionError = null;
+
+  if (state?.apiUrl && state?.sessionId && state?.sessionToken) {
+    try {
+      production = await getJson(
+        `${trimTrailingSlash(state.apiUrl)}/onboarding/raw/session/${encodeURIComponent(state.sessionId)}/status`,
+        { token: state.sessionToken },
+      );
+      await updateAgentStateFromOnboardingResponse(state, production);
+    } catch (err) {
+      productionError = safeError(err);
+    }
+  }
+
+  const userId = production?.sessionId ?? state?.sessionId ?? null;
+  const providers = production?.providers ?? state?.providers ?? {};
+  const messagesLocal = await collectMessagesLocalStatus(userId);
+  const codingSessionsLocal = await collectCodingSessionsLocalStatus(userId);
+
+  return {
+    statePath,
+    configured: Boolean(state),
+    account: production?.account ?? state?.account ?? null,
+    savedSources: state?.sources ?? {},
+    providers,
+    production: production
+      ? {
+          status: production.status,
+          providers,
+          rawOnly: production.rawOnly === true,
+          processingEnabled: production.processingEnabled === true,
+          processing: production.processing,
+        }
+      : null,
+    productionError,
+    local: {
+      messages: messagesLocal,
+      codingSessions: codingSessionsLocal,
+    },
+    commands: {
+      login: `${agentCommand()} agent --login`,
+      checkStatus: `${agentCommand()} status`,
+      addCodingSessions: `${agentCommand()} agent --add-sources coding-sessions --name "<full_name>" --org "<organization>"`,
+      continueSetup: `${agentCommand()} agent --continue`,
+      codingSessionsStatus: `${agentCommand()} coding-sessions-status`,
+      messagesChats: `${agentCommand()} messages-chats`,
+    },
+  };
+}
+
+function printShepherdStatus(status) {
+  console.log(renderShepherdStatus(status));
+}
+
+function renderShepherdStatus(status) {
+  const lines = ["", "Shepherd sync status", ""];
+
+  if (status.account) {
+    const email = status.account.email ? ` <${status.account.email}>` : "";
+    const org = status.account.organizationName ? ` / ${status.account.organizationName}` : "";
+    lines.push(`Account: ${status.account.name ?? "unknown"}${email}${org}`);
+  } else {
+    lines.push("Account: no saved Shepherd onboarding session found");
+  }
+
+  if (status.productionError) {
+    lines.push(`Production status: unavailable (${status.productionError})`);
+  } else if (status.production) {
+    lines.push(`Production status: ${status.production.status ?? "unknown"}`);
+    lines.push(`Downstream processing: ${status.production.processingEnabled ? "enabled" : "not enabled"}`);
+  } else {
+    lines.push("Production status: not checked");
+  }
+
+  lines.push("", "Sources:");
+  for (const source of statusSourceRows(status.providers, status.savedSources)) {
+    const label = source.connected
+      ? "connected"
+      : source.seen
+        ? "not connected"
+        : source.selected
+          ? "selected in saved setup; connection unknown"
+          : "not enabled in saved setup";
+    lines.push(`- ${source.label}: ${label}`);
+  }
+
+  lines.push("", "Local sync:");
+  lines.push(...renderLocalMessagesStatus(status.local.messages));
+  lines.push(...renderLocalCodingSessionsStatus(status.local.codingSessions));
+
+  lines.push("", "Useful commands:");
+  if (!status.configured) lines.push(`- Sign in: ${status.commands.login}`);
+  lines.push(`- Check again: ${status.commands.checkStatus}`);
+  lines.push(`- Add coding sessions: ${status.commands.addCodingSessions}`);
+  lines.push(`- Continue pending setup: ${status.commands.continueSetup}`);
+  return lines.join("\n");
+}
+
+function statusSourceRows(providers, savedSources = {}) {
+  const definitions = [
+    ["google", "Google Workspace", "google"],
+    ["slack", "Slack", "slack"],
+    ["granola", "Granola", "granola"],
+    ["messages", "Messages", "messages"],
+    ["codingSessions", "Coding Sessions", "codingSessions"],
+  ];
+  return definitions.map(([key, label, sourceKey]) => ({
+    key,
+    label,
+    seen: Boolean(providers?.[key]),
+    selected: savedSources?.[sourceKey] === true,
+    connected: providers?.[key]?.connected === true,
+  }));
+}
+
+function printLocalMessagesStatus(status) {
+  console.log(renderLocalMessagesStatus(status).join("\n"));
+}
+
+function renderLocalMessagesStatus(status) {
+  const lines = [];
+  const prefix = "- Messages local agent";
+  if (!status.configPath) {
+    lines.push(`${prefix}: not configured`);
+  } else {
+    lines.push(`${prefix}: configured at ${status.configPath}`);
+  }
+  if (status.launch) {
+    lines.push(`  LaunchAgent: ${status.launch.label} ${status.launch.running ? "running" : "not running or unknown"}`);
+  } else {
+    lines.push("  LaunchAgent: not installed or unavailable");
+  }
+  lines.push(`  Messages database: ${status.storage.readable ? "readable" : `not readable (${status.storage.reason})`}`);
+  lines.push(`  Queued unsent messages: ${status.queueDepth}`);
+  return lines;
+}
+
+function printLocalCodingSessionsStatus(status) {
+  console.log(renderLocalCodingSessionsStatus(status).join("\n"));
+}
+
+function renderLocalCodingSessionsStatus(status) {
+  const lines = [];
+  const prefix = "- Coding Sessions local agent";
+  if (!status.configPath) {
+    lines.push(`${prefix}: not configured`);
+  } else {
+    lines.push(`${prefix}: configured at ${status.configPath}`);
+  }
+  if (status.launch) {
+    lines.push(`  LaunchAgent: ${status.launch.label} ${status.launch.running ? "running" : "not running or unknown"}`);
+  } else {
+    lines.push("  LaunchAgent: not installed or unavailable");
+  }
+  for (const probe of status.localFolders) {
+    lines.push(`  ${probe.provider}: ${probe.path} ${probe.readable ? "readable" : `not readable (${probe.reason})`}`);
+  }
+  if (status.lastSync) {
+    lines.push(`  Last sync: ${status.lastSync.finishedAt ?? "unknown"} (${status.lastSync.scanned ?? 0} scanned, ${status.lastSync.changed ?? 0} changed)`);
+  } else {
+    lines.push("  Last sync: none recorded");
+  }
+  lines.push(`  Queued unsent sessions: ${status.queueDepth}`);
+  return lines;
 }
 
 async function runMessagesChatsCommand() {
@@ -1173,55 +1471,85 @@ async function runCodingSessionsAgent() {
   }
 }
 
-async function runCodingSessionsStatus() {
-  const configPath = stringArg("config") ?? await latestCodingSessionsConfigPath();
-  const config = configPath ? JSON.parse(await readFile(configPath, "utf8")) : null;
-  const userId = config?.userId ?? null;
+async function collectMessagesLocalStatus(preferredUserId = null) {
+  const configPath = await messagesConfigPathForUser(preferredUserId) ?? await latestMessagesConfigPath();
+  const config = configPath ? readJsonOptional(configPath) : null;
+  const userId = config?.userId ?? preferredUserId ?? null;
+  const safeId = userId ? safeFileId(userId) : null;
+  const label = safeId ? `ai.shepherd.raw-messages.${safeId}` : null;
+  const queue = safeId ? readJsonOptional(join(homedir(), ".shepherd", "raw-messages", `${safeId}-queue.json`)) : null;
+
+  return {
+    configPath: configPath ?? null,
+    userId,
+    allChats: config?.allChats === true,
+    selectedChatCount: Array.isArray(config?.allowedChatIds) ? config.allowedChatIds.length : 0,
+    storage: await probePath("messages", MESSAGES_CHAT_DB_PATH),
+    launch: localLaunchStatus(label),
+    queueDepth: Array.isArray(queue) ? queue.length : 0,
+  };
+}
+
+async function collectCodingSessionsLocalStatus(preferredUserId = null, explicitConfigPath = null) {
+  const configPath = explicitConfigPath ?? await codingSessionsConfigPathForUser(preferredUserId) ?? await latestCodingSessionsConfigPath();
+  const config = configPath ? readJsonOptional(configPath) : null;
+  const userId = config?.userId ?? preferredUserId ?? null;
   const safeId = userId ? safeFileId(userId) : null;
   const label = safeId ? `ai.shepherd.coding-sessions.${safeId}` : null;
-  const probes = await probeCodingSessionPaths(config ?? {});
-  const lastSync = userId ? readJsonOptional(codingSessionsStatusFile(userId)) : null;
-  const queue = userId ? readJsonOptional(join(homedir(), ".shepherd", "coding-sessions", `${safeFileId(userId)}-queue.json`)) : null;
-  const launch = label && platform() === "darwin"
-    ? {
-        label,
-        state: readLaunchctlPrint(`gui/${process.getuid?.() ?? 501}/${label}`),
-      }
-    : null;
-  const production = await productionOnboardingStatusForCodingSessions(config).catch((err) => ({ error: safeError(err) }));
-  const status = {
+  const queue = safeId ? readJsonOptional(join(homedir(), ".shepherd", "coding-sessions", `${safeId}-queue.json`)) : null;
+
+  return {
     configPath: configPath ?? null,
     userId,
-    localFolders: probes,
-    launch,
-    lastSync,
+    localFolders: await probeCodingSessionPaths(config ?? {}),
+    launch: localLaunchStatus(label),
+    lastSync: userId ? readJsonOptional(codingSessionsStatusFile(userId)) : null,
     queueDepth: Array.isArray(queue) ? queue.length : 0,
+  };
+}
+
+function localLaunchStatus(label) {
+  if (!label || platform() !== "darwin") return null;
+  const state = readLaunchctlPrint(`gui/${process.getuid?.() ?? 501}/${label}`);
+  return {
+    label,
+    running: /state = running|job state = running/i.test(state),
+    state,
+  };
+}
+
+async function runCodingSessionsStatus() {
+  const configPath = stringArg("config") ?? await latestCodingSessionsConfigPath();
+  const status = await collectCodingSessionsLocalStatus(null, configPath);
+  const config = configPath ? readJsonOptional(configPath) : null;
+  const production = await productionOnboardingStatusForCodingSessions(config).catch((err) => ({ error: safeError(err) }));
+  const detailedStatus = {
+    ...status,
     production,
   };
 
   if (args.json) {
-    console.log(JSON.stringify(status, null, 2));
+    console.log(JSON.stringify(detailedStatus, null, 2));
     return;
   }
 
   console.log("\nShepherd coding-session sync status\n");
-  console.log(`Config: ${configPath ?? "not found"}`);
-  if (userId) console.log(`User: ${userId}`);
-  for (const probe of probes) {
+  console.log(`Config: ${detailedStatus.configPath ?? "not found"}`);
+  if (detailedStatus.userId) console.log(`User: ${detailedStatus.userId}`);
+  for (const probe of detailedStatus.localFolders) {
     console.log(`- ${probe.provider}: ${probe.path} ${probe.readable ? "readable" : `not readable (${probe.reason})`}`);
   }
-  if (launch) {
-    const running = /state = running|job state = running/i.test(launch.state);
-    console.log(`LaunchAgent: ${launch.label} ${running ? "running" : "not running or unknown"}`);
+  if (detailedStatus.launch) {
+    console.log(`LaunchAgent: ${detailedStatus.launch.label} ${detailedStatus.launch.running ? "running" : "not running or unknown"}`);
   } else {
     console.log("LaunchAgent: not installed or unavailable");
   }
-  if (lastSync) {
-    console.log(`Last sync: ${lastSync.finishedAt ?? "unknown"} (${lastSync.scanned ?? 0} scanned, ${lastSync.changed ?? 0} changed)`);
+  if (detailedStatus.lastSync) {
+    console.log(`Last sync: ${detailedStatus.lastSync.finishedAt ?? "unknown"} (${detailedStatus.lastSync.scanned ?? 0} scanned, ${detailedStatus.lastSync.changed ?? 0} changed)`);
   } else {
     console.log("Last sync: none recorded");
   }
-  console.log(`Queued unsent sessions: ${Array.isArray(queue) ? queue.length : 0}`);
+  console.log(`Queued unsent sessions: ${detailedStatus.queueDepth}`);
   if (production?.providers?.codingSessions) {
     console.log(`Production provider: ${production.providers.codingSessions.connected ? "connected" : "not connected"}`);
   } else if (production?.error) {
@@ -1264,6 +1592,7 @@ Usage:
   npx -y ${PACKAGE_NAME}@latest agent --continue --granola-api-key <key> --messages-handle <value> --messages-chat-ids <ids|all>
   npx -y ${PACKAGE_NAME}@latest agent --add-sources coding-sessions --name <name> --org <organization>
   npx -y ${PACKAGE_NAME}@latest agent --status
+  npx -y ${PACKAGE_NAME}@latest status
   npx -y ${PACKAGE_NAME}@latest coding-sessions-status
   npx -y ${PACKAGE_NAME}@latest messages-chats
   npx -y ${PACKAGE_NAME}@latest granola-api-keys
@@ -1274,6 +1603,28 @@ The bare agent command is intended for coding-agent shells. For direct terminal
     return;
   }
 
+  if (which === "status" || which === "sync-status" || which === "check") {
+    console.log(`Shepherd sync status
+
+Usage:
+  npx -y ${PACKAGE_NAME}@latest status
+  npx -y ${PACKAGE_NAME}@latest status --json
+
+Shows the saved Shepherd account, connected cloud sources, production processing
+state, and local background sync health for Messages and Coding Sessions.
+
+Aliases:
+  sync-status
+  check
+
+Options:
+  --json                     Print machine-readable status.
+  --state <path>             Local onboarding state file. Defaults to ~/.shepherd/raw-onboarding-agent.json.
+  --help                     Show this help.
+`);
+    return;
+  }
+
   if (which === "coding-sessions-agent") {
     console.log(`Shepherd coding-session sync agent
 
@@ -1406,6 +1757,9 @@ Usage:
 
 This command is installed into MCP clients. It reads ~/.shepherd/mcp.json and
 proxies stdio MCP traffic to the authenticated production Shepherd MCP endpoint.
+It also exposes local npm-backed setup/status tools such as shepherd_status and
+shepherd_setup_coding_sessions so agents can answer what is enabled locally and
+guide coding-session setup.
 
 Options:
   --state <path>             Token state file. Defaults to ~/.shepherd/mcp.json.
@@ -1420,6 +1774,7 @@ Options:
 Usage:
   npx -y ${PACKAGE_NAME}@latest
   npx -y ${PACKAGE_NAME}@latest agent
+  npx -y ${PACKAGE_NAME}@latest status
   npx -y ${PACKAGE_NAME}@latest mcp-login
   npx -y ${PACKAGE_NAME}@latest mcp-install
   npx -y ${PACKAGE_NAME}@latest messages-chats
@@ -1479,6 +1834,16 @@ function printAgentContract() {
   const payload = {
     task: "Complete Shepherd customer-facing production raw-source onboarding for this user with the public customer setup flow.",
     instruction: "Use this as a public onboarding checklist. Confirm required onboarding choices and fields directly with the user instead of assuming them from local repo context, shell identity, machine paths, or earlier conversations.",
+    commonUserRequests: [
+      {
+        userSays: "Check what I've enabled for Shepherd.",
+        agentShould: `Run ${command} status and summarize connected sources, local background agents, unreadable folders, queued items, and any next command it prints.`,
+      },
+      {
+        userSays: "Help me set up coding agent sessions.",
+        agentShould: `Ask for consent to sync Codex and Claude Code summaries, then run ${command} agent --login if there is no saved Shepherd login, ${command} agent --add-sources coding-sessions --name "<full_name>" --org "<organization>", ${command} agent --continue, and finally ${command} status.`,
+      },
+    ],
     askStyle: [
       "Ask in short interactive prompts, not as a pasted checklist.",
       "Start with selection questions to determine what the user wants connected.",
@@ -1547,13 +1912,15 @@ function printAgentContract() {
     startCommand: `${command} agent --name "<full_name>" --org "<organization>"`,
     addSourcesCommand: `${command} agent --add-sources coding-sessions --name "<full_name>" --org "<organization>"`,
     continueCommand: `${command} agent --continue`,
+    checkCommand: `${command} status`,
     mcpLoginCommand: `${command} mcp-login`,
     optionalContinueArgs: [
       "--messages-handle \"<phone_or_apple_id>\" if local Messages is being connected",
       "--messages-chat-ids \"<comma_separated_chat_ids>\" if local Messages is being connected, or --messages-chat-ids all when the user explicitly wants every current and future Messages chat watched",
       "--granola-api-key \"<granola_key>\" if Granola is being connected",
     ],
-    statusCommand: `${command} agent --status`,
+    statusCommand: `${command} status`,
+    agentStatusCommand: `${command} agent --status`,
     messagesChatsCommand: `${command} messages-chats`,
     messagesPermissions: {
       macOS: "Local Messages raw sync needs Full Disk Access for the app running onboarding and for Node.js used by the background LaunchAgent. The Messages selector command validates local chat.db access, opens Full Disk Access settings if needed, and keeps checking until access works in interactive onboarding. Background sync install also checks that launchd can start the Messages agent. Contacts permission may also appear when resolving local contact names. The background Messages agent reloads Contacts on startup, watches AddressBook changes when available, and runs fallback contact sync so renamed contacts can hydrate prior ingested Messages rows for the token-bound customer account.",
@@ -1585,6 +1952,16 @@ Confirm onboarding choices and fields directly with the user instead of assuming
 
 Ask with short interactive prompts, not as one pasted checklist. Do not paste this whole checklist into the chat unless the user explicitly asks to see it.
 
+Common user requests:
+- If the user asks "Check what I've enabled for Shepherd?", run:
+  ${payload.checkCommand}
+  Then summarize connected sources, local background agents, unreadable folders, queued items, and the next command to fix anything missing.
+- If the user asks "Help me set up coding agent sessions", ask for consent to sync Codex and Claude Code summaries, then run login if needed, add only the coding-sessions source, continue setup, and finish by checking status:
+  ${payload.loginCommand}
+  ${payload.addSourcesCommand}
+  ${payload.continueCommand}
+  ${payload.checkCommand}
+
 Start with selection questions to determine intent:
 1. Organization: Join existing org, or Create new org.
 2. Sources: Google Workspace (Gmail/Drive/Docs/Calendar/Sheets/Slides/Tasks/Contacts), Slack, Granola, Messages, Coding Sessions (Codex/Claude Code summaries). Allow multi-select if your interface supports it.
@@ -2509,6 +2886,7 @@ function readLaunchctlPrint(domainLabel) {
   try {
     return execFileSync("launchctl", ["print", domainLabel], {
       encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
       timeout: 5_000,
     });
   } catch (err) {
@@ -4317,15 +4695,36 @@ function extractCodexCommands(payloads) {
 function extractClaudeCommands(lines) {
   const commands = [];
   for (const line of lines) {
-    const text = JSON.stringify(line.toolUseResult ?? line.message?.content ?? "");
-    const bashMatch = text.match(/(?:"command"|"input")\s*:\s*"([^"]{2,500})"/);
-    if (bashMatch && /\b(?:git|npm|pnpm|yarn|bun|pytest|vitest|cargo|go|python|node|tsc|ruff|eslint|make)\b/.test(bashMatch[1])) {
-      commands.push({ command: redactText(unescapeJsonString(bashMatch[1]), 600), exitCode: null, summary: null });
+    for (const command of extractCommandStrings(line.toolUseResult ?? line.message?.content ?? line)) {
+      if (isLikelyShellCommand(command)) {
+        commands.push({ command: redactText(command, 600), exitCode: null, summary: null });
+      }
     }
   }
   return commands.slice(-100);
 }
 
+function extractCommandStrings(value, depth = 0) {
+  if (depth > 6 || value == null) return [];
+  if (typeof value === "string") return [];
+  if (Array.isArray(value)) return value.flatMap((item) => extractCommandStrings(item, depth + 1));
+  if (typeof value !== "object") return [];
+
+  const commands = [];
+  for (const [key, nested] of Object.entries(value)) {
+    if ((key === "command" || key === "input") && typeof nested === "string" && nested.trim()) {
+      commands.push(nested);
+      continue;
+    }
+    commands.push(...extractCommandStrings(nested, depth + 1));
+  }
+  return commands;
+}
+
+function isLikelyShellCommand(value) {
+  return /\b(?:git|npm|pnpm|yarn|bun|pytest|vitest|cargo|go|python|node|tsc|ruff|eslint|make)\b/.test(value);
+}
+
 async function repoMetadata(cwd) {
   const base = { fullName: null, remote: null, branch: null, commit: null };
   if (!cwd) return base;
@@ -4474,20 +4873,12 @@ function redactText(value, maxLength = 1000) {
     .replace(/-----BEGIN [^-]+PRIVATE KEY-----[\s\S]*?-----END [^-]+PRIVATE KEY-----/g, "[redacted-private-key]")
     .replace(/\b(?:sk|pk|rk|ghp|github_pat|xox[baprs])_[A-Za-z0-9_=-]{12,}\b/g, "[redacted-token]")
     .replace(/\b[A-Za-z0-9._%+-]+:[A-Za-z0-9._%+-]+@/g, "[redacted-credentials]@")
-    .replace(/\b(?:authorization|x-api-key|api[_-]?key|token|secret|password)\s*[:=]\s*['\"]?[^'\"\s]+/gi, "$1=[redacted]")
+    .replace(/\b(authorization|x-api-key|api[_-]?key|token|secret|password)(\s*[:=]\s*)['"]?[^'"\s]+/gi, "$1$2[redacted]")
     .replace(/(OPENAI_API_KEY|FIREWORKS_API_KEY|ANTHROPIC_API_KEY|DATABASE_URL|REDIS_URL)=\S+/g, "$1=[redacted]")
     .replace(new RegExp(homedir().replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g"), "~")
     .slice(0, maxLength);
 }
 
-function unescapeJsonString(value) {
-  try {
-    return JSON.parse(`"${value.replace(/"/g, '\\"')}"`);
-  } catch {
-    return value;
-  }
-}
-
 function hashString(value) {
   return createHash("sha256").update(String(value ?? "")).digest("hex");
 }
@@ -4515,6 +4906,35 @@ function codingSessionsStatusFile(userId) {
   return path;
 }
 
+async function messagesConfigPathForUser(userId) {
+  if (!userId) return null;
+  const path = join(homedir(), ".shepherd", "raw-messages", `${userId}.json`);
+  return existsSync(path) ? path : null;
+}
+
+async function codingSessionsConfigPathForUser(userId) {
+  if (!userId) return null;
+  const path = join(homedir(), ".shepherd", "coding-sessions", `${userId}.json`);
+  return existsSync(path) ? path : null;
+}
+
+async function latestMessagesConfigPath() {
+  const dir = join(homedir(), ".shepherd", "raw-messages");
+  try {
+    const entries = await readdir(dir, { withFileTypes: true });
+    const files = [];
+    for (const entry of entries) {
+      if (!entry.isFile() || !entry.name.endsWith(".json") || entry.name.includes("-queue")) continue;
+      const path = join(dir, entry.name);
+      const info = await stat(path).catch(() => null);
+      if (info) files.push({ path, mtimeMs: info.mtimeMs });
+    }
+    return files.sort((a, b) => b.mtimeMs - a.mtimeMs)[0]?.path ?? null;
+  } catch {
+    return null;
+  }
+}
+
 async function latestCodingSessionsConfigPath() {
   const dir = join(homedir(), ".shepherd", "coding-sessions");
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askshepherd",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "description": "Customer-facing Shepherd production onboarding and MCP CLI",
   "type": "module",
   "bin": {