@todoforai/tfa-memory 0.4.2 → 0.4.4

package/dist/cli.js

@@ -11,6 +11,9 @@ import { readFileSync, writeFileSync, mkdirSync, chmodSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { homedir, platform } from "node:os";
 var DEFAULT_API_URL = "https://api.todofor.ai";
+function runActorToken() {
+  return process.env.TODOFORAI_USER_ID ? process.env.TODOFORAI_API_TOKEN || "" : "";
+}
 function normalizeApiUrl(url) {
   if (url.startsWith("localhost"))
     return `http://${url}`;
@@ -38,9 +41,13 @@ function writeSecure(data) {
 }
 function readStoredAuth(apiUrl) {
   const c = read();
-  const apiToken = c[apiUrl] || c.apiToken || c.apiKey || "";
   const host = c.backendHost || "";
   const storedApiUrl = typeof c.apiUrl === "string" && c.apiUrl ? c.apiUrl : host ? `${host === "localhost" || host === "127.0.0.1" ? "http" : "https"}://${host}` : undefined;
+  const dstIsForThisUrl = !storedApiUrl || normalizeApiUrl(storedApiUrl) === normalizeApiUrl(apiUrl);
+  const isDst = typeof c.apiToken === "string" && c.apiToken.startsWith("dst_");
+  const dst = dstIsForThisUrl && isDst ? c.apiToken : "";
+  const fallbackApiToken = isDst && !dstIsForThisUrl ? "" : c.apiToken;
+  const apiToken = dst || c[apiUrl] || fallbackApiToken || c.apiKey || "";
   return {
     apiToken: typeof apiToken === "string" ? apiToken : "",
     apiUrl: storedApiUrl,
@@ -64,6 +71,10 @@ async function refreshDeviceToken(opts = {}) {
   const apiUrl = normalizeApiUrl(opts.apiUrl || envUrl || stored.apiUrl || DEFAULT_API_URL);
   if (!stored.deviceId || !stored.deviceSecret)
     return "";
+  if (runActorToken())
+    return "";
+  if (stored.apiUrl && normalizeApiUrl(stored.apiUrl) !== apiUrl)
+    return "";
   try {
     const res = await fetch(`${apiUrl}/api/v1/cli/device/token`, {
       method: "POST",
@@ -90,7 +101,7 @@ async function fetchWithRenew(url, init, opts) {
     return fetch(url, { ...init, headers });
   };
   const res = await send(opts.token);
-  if (renewOn.includes(res.status) && opts.token.startsWith("dst_")) {
+  if (renewOn.includes(res.status)) {
     const fresh = await refreshDeviceToken({ apiUrl: opts.apiUrl });
     if (fresh && fresh !== opts.token)
       return { res: await send(fresh), token: fresh };
@@ -116,6 +127,9 @@ import { homedir as homedir2, platform as platform2 } from "node:os";
 import { spawn } from "node:child_process";
 import { platform as platform22, hostname } from "node:os";
 var DEFAULT_API_URL2 = "https://api.todofor.ai";
+function runActorToken2() {
+  return process.env.TODOFORAI_USER_ID ? process.env.TODOFORAI_API_TOKEN || "" : "";
+}
 function normalizeApiUrl2(url) {
   if (url.startsWith("localhost"))
     return `http://${url}`;
@@ -146,9 +160,13 @@ function writeCredentials(fields) {
 }
 function readStoredAuth2(apiUrl) {
   const c = read2();
-  const apiToken = c[apiUrl] || c.apiToken || c.apiKey || "";
   const host = c.backendHost || "";
   const storedApiUrl = typeof c.apiUrl === "string" && c.apiUrl ? c.apiUrl : host ? `${host === "localhost" || host === "127.0.0.1" ? "http" : "https"}://${host}` : undefined;
+  const dstIsForThisUrl = !storedApiUrl || normalizeApiUrl2(storedApiUrl) === normalizeApiUrl2(apiUrl);
+  const isDst = typeof c.apiToken === "string" && c.apiToken.startsWith("dst_");
+  const dst = dstIsForThisUrl && isDst ? c.apiToken : "";
+  const fallbackApiToken = isDst && !dstIsForThisUrl ? "" : c.apiToken;
+  const apiToken = dst || c[apiUrl] || fallbackApiToken || c.apiKey || "";
   return {
     apiToken: typeof apiToken === "string" ? apiToken : "",
     apiUrl: storedApiUrl,
@@ -172,6 +190,10 @@ async function refreshDeviceToken2(opts = {}) {
   const apiUrl = normalizeApiUrl2(opts.apiUrl || envUrl || stored.apiUrl || DEFAULT_API_URL2);
   if (!stored.deviceId || !stored.deviceSecret)
     return "";
+  if (runActorToken2())
+    return "";
+  if (stored.apiUrl && normalizeApiUrl2(stored.apiUrl) !== apiUrl)
+    return "";
   try {
     const res = await fetch(`${apiUrl}/api/v1/cli/device/token`, {
       method: "POST",
@@ -290,6 +312,9 @@ import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSy
 import { join as join3, dirname as dirname3 } from "node:path";
 import { homedir as homedir3, platform as platform3 } from "node:os";
 var DEFAULT_API_URL3 = "https://api.todofor.ai";
+function runActorToken3() {
+  return process.env.TODOFORAI_USER_ID ? process.env.TODOFORAI_API_TOKEN || "" : "";
+}
 function normalizeApiUrl3(url) {
   if (url.startsWith("localhost"))
     return `http://${url}`;
@@ -317,9 +342,13 @@ function writeSecure3(data) {
 }
 function readStoredAuth3(apiUrl) {
   const c = read3();
-  const apiToken = c[apiUrl] || c.apiToken || c.apiKey || "";
   const host = c.backendHost || "";
   const storedApiUrl = typeof c.apiUrl === "string" && c.apiUrl ? c.apiUrl : host ? `${host === "localhost" || host === "127.0.0.1" ? "http" : "https"}://${host}` : undefined;
+  const dstIsForThisUrl = !storedApiUrl || normalizeApiUrl3(storedApiUrl) === normalizeApiUrl3(apiUrl);
+  const isDst = typeof c.apiToken === "string" && c.apiToken.startsWith("dst_");
+  const dst = dstIsForThisUrl && isDst ? c.apiToken : "";
+  const fallbackApiToken = isDst && !dstIsForThisUrl ? "" : c.apiToken;
+  const apiToken = dst || c[apiUrl] || fallbackApiToken || c.apiKey || "";
   return {
     apiToken: typeof apiToken === "string" ? apiToken : "",
     apiUrl: storedApiUrl,
@@ -343,6 +372,10 @@ async function refreshDeviceToken3(opts = {}) {
   const apiUrl = normalizeApiUrl3(opts.apiUrl || envUrl || stored.apiUrl || DEFAULT_API_URL3);
   if (!stored.deviceId || !stored.deviceSecret)
     return "";
+  if (runActorToken3())
+    return "";
+  if (stored.apiUrl && normalizeApiUrl3(stored.apiUrl) !== apiUrl)
+    return "";
   try {
     const res = await fetch(`${apiUrl}/api/v1/cli/device/token`, {
       method: "POST",
@@ -369,7 +402,7 @@ async function fetchWithRenew2(url, init, opts) {
     return fetch(url, { ...init, headers });
   };
   const res = await send(opts.token);
-  if (renewOn.includes(res.status) && opts.token.startsWith("dst_")) {
+  if (renewOn.includes(res.status)) {
     const fresh = await refreshDeviceToken3({ apiUrl: opts.apiUrl });
     if (fresh && fresh !== opts.token)
       return { res: await send(fresh), token: fresh };
@@ -479,8 +512,8 @@ function checkForUpdates(pkg) {
 // package.json
 var package_default = {
   name: "@todoforai/tfa-memory",
-  version: "0.4.2",
-  description: "Zero-config TODOforAI memory CLI — add/search/ls/get/rm text memory rows addressed as source/ref, plus federated search over every message of every past TODO (read-only `todo` source), with full-text and semantic search. Reuses bridge credentials.",
+  version: "0.4.4",
+  description: "Zero-config TODOforAI memory CLI — add/search/ls/get/rm/live text memory rows addressed as source/ref, plus federated search over every message of every past TODO (read-only `todo` source), with full-text and semantic search, plus L2 working-memory re-render. Reuses bridge credentials.",
   type: "module",
   bin: {
     "tfa-memory": "dist/cli.js"
@@ -521,6 +554,10 @@ every TODO under the read-only \`todo\` source (\`todo/<todoId>:<messageId>\`,
 live from the backend index, nothing separate to sync). \`--source todo\` searches
 past TODO messages only; \`get todo/<todoId>:<messageId>\` prints the whole message.
 
+Owner-private TODOs are searchable in personal contexts. In agent shells,
+TODOFORAI_TODO_ID supplies the destination; shared conversations cannot read
+private TODOs or account-private saved notes. --todo selects a source, not an audience.
+
 Usage:
   tfa-memory <command> [options] [args...]
 
@@ -528,8 +565,10 @@ Commands:
   add [source/ref] <text|->     Save a row. Without an address → manual/<timestamp>.
                                 "-" reads stdin.
   search <query>                Full-text search over saved rows + past TODO messages
+  live                          Re-render L2 working memory (the always-on prompt block)
   ls                            List saved rows, newest first (todo messages excluded)
   get <source/ref>              Print full content of one row
+  around <source/ref>           Neighbours of one row: todo messages in chat order, saved rows by time within the source
   rm <source/ref>               Delete one row
   rm --source <name>            Delete every row in a source
   sources                       List sources with counts and last write
@@ -539,7 +578,11 @@ Commands:
 Options:
   -s, --source <a,b>            Restrict search/ls to sources (comma-separated; "todo" = TODO messages)
       --todo <id>               Restrict a todo-message search to one TODO
-      --semantic                Embedding KNN search (meaning, not keywords)
+  -B, --budget <n>              Token budget for \`live\` (default 1500, 100–20000)
+      --mode lexical|semantic|fused  lexical: all words, newest first (default) · semantic: meaning · fused: best recall
+      --exclude <address>       Leave out an already-read row (repeatable); fused also prints the lexical match count
+      --before <n>              around: rows before the pivot (default 2, max 200)
+      --after <n>               around: rows after the pivot (default 2, max 200); large = read the rest
       --meta <json>             Attach JSON metadata to the row (e.g. '{"todoId":"..."}')
   -n, --limit <n>               Max rows (default 5, max 50)
   -j, --json                    Machine-readable output
@@ -554,8 +597,10 @@ Examples:
   tfa-memory add deploy-notes/rollback "run scripts/rollback.sh, then verify /health"
   cat docs/auth.md | tfa-memory add acme/docs/auth.md -
   tfa-memory search "rollback procedure"
-  tfa-memory search "how do we deploy" --semantic
+  tfa-memory search "how do we deploy" --mode semantic
   tfa-memory search "android build" --source todo
+  tfa-memory live
+  tfa-memory live -B 800
   tfa-memory get todo/<todoId>:<messageId>
   tfa-memory ls --source deploy-notes
   tfa-memory get deploy-notes/rollback
@@ -591,7 +636,10 @@ function resolveMemoryUrl(flag, apiUrl) {
 async function api(ctx, method, path2, body) {
   const init = {
     method,
-    headers: body !== undefined ? { "content-type": "application/json" } : {},
+    headers: {
+      ...body !== undefined && { "content-type": "application/json" },
+      ...process.env.TODOFORAI_TODO_ID && { "x-tfa-todo-id": process.env.TODOFORAI_TODO_ID }
+    },
     body: body !== undefined ? JSON.stringify(body) : undefined
   };
   const { res, token } = await fetchWithRenew(`${ctx.memoryUrl}/v1${path2}`, init, { apiUrl: ctx.apiUrl, token: ctx.token, renewOn: [401, 403] });
@@ -631,8 +679,12 @@ async function main() {
     options: {
       source: { type: "string", short: "s" },
       todo: { type: "string" },
+      budget: { type: "string", short: "B" },
       meta: { type: "string" },
-      semantic: { type: "boolean", default: false },
+      mode: { type: "string" },
+      exclude: { type: "string", multiple: true },
+      before: { type: "string" },
+      after: { type: "string" },
       limit: { type: "string", short: "n" },
       json: { type: "boolean", short: "j", default: false },
       "api-token": { type: "string" },
@@ -711,12 +763,28 @@ async function main() {
     }
     case "search": {
       const query = rest[0] ?? die(`usage: tfa-memory search "query"`, 2);
-      const res = await api(ctx, "GET", `/memory/search${qs({ query, semantic: values.semantic ? true : undefined, sources, limit, todoId: values.todo })}`);
+      const exclude = values.exclude?.join(",");
+      const res = await api(ctx, "GET", `/memory/search${qs({ query, mode: values.mode, sources, limit, todoId: values.todo, exclude })}`);
       for (const w of res.warnings ?? [])
         console.error(`Warning: ${w}`);
+      if (res.lexicalCount !== undefined)
+        console.error(`${res.lexicalCount} row(s) contain a query word`);
       printRows(res.rows, json);
       break;
     }
+    case "live": {
+      const budget = values.budget !== undefined ? Number(values.budget) : 1500;
+      if (!Number.isInteger(budget) || budget < 100 || budget > 20000)
+        die(`--budget must be an integer from 100 to 20000`, 2);
+      const res = await api(ctx, "GET", `/live/render${qs({ budget })}`);
+      const block = res.block ?? "";
+      if (json)
+        console.log(JSON.stringify({ block }));
+      else
+        process.stdout.write((block || "(empty live memory)") + `
+`);
+      break;
+    }
     case "ls": {
       const res = await api(ctx, "GET", `/memory${qs({ sources, limit })}`);
       printRows(res.rows, json);
@@ -732,6 +800,14 @@ async function main() {
 `);
       break;
     }
+    case "around": {
+      const [source, ref] = splitAddr(rest[0] ?? die("address required (source/ref)", 2));
+      const res = await api(ctx, "GET", `/memory/around${qs({ source, ref, before: values.before, after: values.after })}`);
+      if (res.total !== undefined)
+        console.error(`message ${res.index + 1} of ${res.total}`);
+      printRows(res.rows, json, 2000);
+      break;
+    }
     case "rm":
     case "delete":
     case "del": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@todoforai/tfa-memory",
-  "version": "0.4.2",
-  "description": "Zero-config TODOforAI memory CLI — add/search/ls/get/rm text memory rows addressed as source/ref, plus federated search over every message of every past TODO (read-only `todo` source), with full-text and semantic search. Reuses bridge credentials.",
+  "version": "0.4.4",
+  "description": "Zero-config TODOforAI memory CLI — add/search/ls/get/rm/live text memory rows addressed as source/ref, plus federated search over every message of every past TODO (read-only `todo` source), with full-text and semantic search, plus L2 working-memory re-render. Reuses bridge credentials.",
   "type": "module",
   "bin": {
     "tfa-memory": "dist/cli.js"