@cortad/connector 0.6.0-rc.2 → 0.6.0

package/lib/history/contract.mjs

@@ -86,7 +86,7 @@ export function selected(raws, { now = Date.now(), secrets = [] } = {}) {
       }),
     });
   }
-  return { conversations: out, messages: HISTORY_MESSAGES - room, scrubbed, left: Object.fromEntries(left), users: new Set(recent.map((c) => c.user).filter(Boolean)).size };
+  return { conversations: out, messages: HISTORY_MESSAGES - room, total: out.reduce((n, c) => n + c.messages.length, 0), scrubbed, left: Object.fromEntries(left), users: new Set(recent.map((c) => c.user).filter(Boolean)).size };
 }
 
 // The span of what will be sent, oldest message to newest.

package/lib/intelligence-text.mjs

@@ -14,7 +14,7 @@ export const header = (app) => [
 ];
 
 export const approveFirst = ({ spec, link, words, machine }) => lines(
-  "This computer is not connected to Cortad yet.",
+  "This computer needs the person's approval to connect to Cortad.",
   `Give the person this link and the four characters, once: ${link}  (characters ${words}, computer ${machine})`,
   "They approve it in a browser where they are signed in to Cortad. The page shows the same four characters and this computer's name; they approve only if both match.",
   `Once they have approved it, run npx -y ${spec} intelligence again. It waits up to a minute and a half for the approval.`,
@@ -22,6 +22,7 @@ export const approveFirst = ({ spec, link, words, machine }) => lines(
 export const pairExpired = (spec) => lines(`The approval link expired before it was approved. Run npx -y ${spec} intelligence again for a new one.`);
 export const paired = (app) => `This computer is now connected to Cortad for ${app}.`;
 export const gone = () => lines("This folder's app is no longer connected to Cortad. Connect it again from cortad.com/sim, then run this command again.");
+export const keyRefused = "Cortad no longer accepts the key this computer kept for this folder, so it asks for a new approval.";
 
 export const keysWritten = (file, at) => [
   `Wrote CORTAD_INGEST_KEY and CORTAD_PUBLIC_KEY to ${file}, lines ${at.ingest} and ${at.page}${at.env ? `, and CORTAD_ENV=development on line ${at.env} so chats on this computer are never counted as your users'` : ""}. ${file} is git-ignored.`,
@@ -55,7 +56,7 @@ export function historyQuestion({ spec, sources, stores }) {
     `Ask the person, with your question tool: "Send our most recent conversations to Cortad, up to 2,500 messages from the last 30 days, so it can show us our users?"`,
     ...options.map((o, i) => `  ${i + 1}. ${o}`),
     ...sources.map((s) => `${s.name} is read from this computer at ${s.host} with the keys in your env; the keys go to ${s.name} only.`),
-    "What is sent goes to cortad.com and is written first to ~/.cortad on this computer, so you can read exactly what was sent.",
+    "Before anything is sent, keys, card numbers, emails and phone numbers in the messages are replaced on this computer, and the app's conversation and user ids are hashed. What is sent goes to cortad.com, and a copy of exactly what was sent stays in ~/.cortad on this computer.",
     "",
     ...exportContract(spec),
   ];
@@ -64,7 +65,8 @@ const storeName = (s) => `${s.where ? `the ${s.where} ${s.kind === "postgres" ?
 
 export const exportContract = (spec) => [
   "For our database: write a one-off script in this folder that reads the conversations with this app's own database client, through the connection this project's env on this computer already has. Do not commit it. Open a read-only transaction and look for no other credentials.",
-  "Read at most the newest 2,500 conversations from the last 30 days: pick their ids first, then their messages. Cortad keeps whole conversations, newest first, up to 2,500 messages. Print one JSON line per conversation:",
+  "Read at most the newest 2,500 conversations from the last 30 days: pick their ids first, then their messages. Cortad keeps whole conversations, newest first, up to 2,500 messages. Print first one line naming the database host it read, then one JSON line per conversation:",
+  `  {"source": {"kind": "postgres", "host": "<the database host from the connection>"}}`,
   `  {"id": "<the app's conversation id>", "user": "<the app's user id, if it has one>", "messages": [{"role": "user" or "assistant", "text": "...", "at": "2026-11-08T14:02:11Z"}]}`,
   `Times need a zone (Z or +03:00) or epoch milliseconds. Tell the person which database host it reads. Pipe it to npx -y ${spec} intelligence history --stdin, then delete the script.`,
 ];
@@ -74,7 +76,7 @@ export function historySent({ result, picked, span, source, file }) {
   const left = Object.entries(picked.left).filter(([why]) => !shortened(why)).map(([why, n]) => `${num(n)} ${why}`);
   const cut = Object.entries(picked.left).filter(([why]) => shortened(why)).map(([why, n]) => `${num(n)} ${why}`);
   return [
-    `Sent ${num(result.taken)} conversations from ${source}, ${num(result.messages)} messages, ${day(span.from)} to ${day(span.to)}.${result.already ? ` ${num(result.already)} were already in Cortad.` : ""}`,
+    `Sent ${num(result.taken)} conversations from ${source}, ${day(span.from)} to ${day(span.to)}: ${num(picked.total)} messages, ${num(result.messages)} of them your app's replies, which is what Cortad counts.${result.already ? ` ${num(result.already)} were already in Cortad.` : ""}`,
     ...(picked.scrubbed ? [`${num(picked.scrubbed)} keys, card numbers, emails or phone numbers were replaced on this computer before sending.`] : []),
     ...(left.length ? [`Left out: ${left.join(", ")}.`] : []),
     ...(cut.length ? [`Shortened: ${cut.join(", ")}.`] : []),
@@ -83,7 +85,7 @@ export function historySent({ result, picked, span, source, file }) {
   ];
 }
 export const historyDry = ({ picked, span, file }) => [
-  `Read ${num(picked.conversations.length)} conversations, ${num(picked.messages)} messages, ${day(span.from)} to ${day(span.to)}. Nothing was sent.`,
+  `Read ${num(picked.conversations.length)} conversations, ${day(span.from)} to ${day(span.to)}: ${num(picked.total)} messages, ${num(picked.messages)} of them your app's replies. Nothing was sent.`,
   `What would be sent is in ${file}.`,
 ];
 export const historyLooksLikeDevelopment = ({ why, spec, rest }) => [
@@ -125,7 +127,7 @@ export function codeStep({ spec, stack, page, file, site, consent, host, settabl
     ...secondQuestion({ spec, host, settable, file, site }),
   ];
 }
-export const SDK = "0.3.2";
+export const SDK = "0.3.3";
 
 function secondQuestion({ spec, host, settable, file, site }) {
   const h = HOSTS[host] ?? HOSTS.other;

package/lib/intelligence.mjs

@@ -29,9 +29,13 @@ export async function intelligence(args, ctx) {
   const { root, spec, token } = ctx;
   const api = (path, init = {}) => request(ctx, path, init);
   const opening = [];
-  if (!token()) {
+  // A key Cortad no longer takes (revoked, idle a month, or its account gone) is the same as none: the
+  // person approves this computer again and the new key replaces it.
+  const refusedKey = token() ? (await api("/mcp/intelligence/start")).status === 401 : false;
+  if (refusedKey) opening.push(say.keyRefused);
+  if (!token() || refusedKey) {
     const result = await pair(ctx, (path, body) => request({ ...ctx, token: () => "" }, path, { method: "POST", body }));
-    if (result.waiting) return { text: say.approveFirst({ spec, ...result }) };
+    if (result.waiting) return { text: [say.lines(opening), say.approveFirst({ spec, ...result })].filter(Boolean).join("\n") };
     if (result.expired) return { text: say.pairExpired(spec) };
     if (result.failed) return { text: say.lines(result.failed), code: 1 };
     opening.push(say.paired(result.app));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortad/connector",
-  "version": "0.6.0-rc.2",
+  "version": "0.6.0",
   "description": "Connects the AI app on your machine to Cortad for test conversations, and gives your coding agent the MCP and skill to run them.",
   "bin": {
     "cortad": "local.mjs"