@corenel/cli 0.4.2 → 0.4.3

package/dist/cli.js

@@ -18931,42 +18931,58 @@ function credentialFilePath(stateDir) {
 }
 var TOKEN_ENV = "CORENEL_TOKEN";
 var API_BASE_ENV = "CORENEL_API_BASE";
-async function writeAuthToken(token, stateDir) {
-  const dir = credentialDir(stateDir);
-  const path = tokenFilePath(stateDir);
-  await fs2.mkdir(dir, { recursive: true, mode: 448 });
-  await fs2.writeFile(path, token.trim() + "\n", { mode: 384 });
-  try {
-    await fs2.chmod(path, 384);
-  } catch {
-  }
-  try {
-    await fs2.chmod(dir, 448);
-  } catch {
-  }
-}
 async function writeLoginCredential(token, opts = {}) {
   const cred = {
     accessToken: token.trim(),
     ...opts.account ? { account: opts.account } : {},
     ...opts.apiBase ? { apiBase: opts.apiBase } : {}
   };
-  const path = credentialFilePath(opts.stateDir);
-  await fs2.mkdir(credentialDir(opts.stateDir), { recursive: true, mode: 448 });
-  await fs2.writeFile(path, `${JSON.stringify(cred, null, 2)}
+  const dir = credentialDir(opts.stateDir);
+  const credPath = credentialFilePath(opts.stateDir);
+  const tokPath = tokenFilePath(opts.stateDir);
+  await fs2.mkdir(dir, { recursive: true, mode: 448 });
+  const credTmp = `${credPath}.tmp-${process.pid.toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+  const tokTmp = `${tokPath}.tmp-${process.pid.toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+  await fs2.writeFile(credTmp, `${JSON.stringify(cred, null, 2)}
+`, { mode: 384 });
+  await fs2.writeFile(tokTmp, `${cred.accessToken}
 `, { mode: 384 });
   try {
-    await fs2.chmod(path, 384);
+    await fs2.chmod(credTmp, 384);
   } catch {
   }
-  await writeAuthToken(cred.accessToken, opts.stateDir);
+  try {
+    await fs2.chmod(tokTmp, 384);
+  } catch {
+  }
+  try {
+    await fs2.rename(credTmp, credPath);
+    await fs2.rename(tokTmp, tokPath);
+  } catch (e) {
+    try {
+      await fs2.rm(credTmp, { force: true });
+    } catch {
+    }
+    try {
+      await fs2.rm(tokTmp, { force: true });
+    } catch {
+    }
+    throw e;
+  }
+  try {
+    await fs2.chmod(dir, 448);
+  } catch {
+  }
+}
+function isMissing(err) {
+  return typeof err === "object" && err !== null && err.code === "ENOENT";
 }
-async function readAuthToken(stateDir) {
+async function readAuthTokenRead(stateDir) {
   try {
     const t = (await fs2.readFile(tokenFilePath(stateDir), "utf8")).trim();
-    return t || null;
-  } catch {
-    return null;
+    return { value: t || null, unreadable: false };
+  } catch (err) {
+    return { value: null, unreadable: !isMissing(err) };
   }
 }
 async function clearAuthToken(stateDir) {
@@ -18975,27 +18991,30 @@ async function clearAuthToken(stateDir) {
   } catch {
   }
 }
-async function readCredentialFile(stateDir) {
+async function readCredentialFileRead(stateDir) {
   let raw;
   try {
     raw = await fs2.readFile(credentialFilePath(stateDir), "utf8");
-  } catch {
-    return null;
+  } catch (err) {
+    return { value: null, unreadable: !isMissing(err) };
   }
   try {
     const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null) return null;
+    if (typeof parsed !== "object" || parsed === null) return { value: null, unreadable: false };
     const c = parsed;
-    if (typeof c.accessToken !== "string" || !c.accessToken) return null;
+    if (typeof c.accessToken !== "string" || !c.accessToken) return { value: null, unreadable: false };
     return {
-      accessToken: c.accessToken,
-      ...typeof c.refreshToken === "string" ? { refreshToken: c.refreshToken } : {},
-      ...typeof c.expiresAt === "number" ? { expiresAt: c.expiresAt } : {},
-      ...typeof c.account === "string" ? { account: c.account } : {},
-      ...typeof c.apiBase === "string" && c.apiBase ? { apiBase: c.apiBase } : {}
+      value: {
+        accessToken: c.accessToken,
+        ...typeof c.refreshToken === "string" ? { refreshToken: c.refreshToken } : {},
+        ...typeof c.expiresAt === "number" ? { expiresAt: c.expiresAt } : {},
+        ...typeof c.account === "string" ? { account: c.account } : {},
+        ...typeof c.apiBase === "string" && c.apiBase ? { apiBase: c.apiBase } : {}
+      },
+      unreadable: false
     };
   } catch {
-    return null;
+    return { value: null, unreadable: false };
   }
 }
 async function clearAllCredentials(stateDir) {
@@ -19011,20 +19030,29 @@ async function resolveNodeCredential(opts = {}) {
   const stateDir = opts.stateDir;
   const fromEnv = env[TOKEN_ENV]?.trim();
   if (fromEnv) return { token: fromEnv, source: "env" };
-  const cred = await readCredentialFile(stateDir);
-  const fileToken = await readAuthToken(stateDir);
+  const credRead = await readCredentialFileRead(stateDir);
+  const tokenRead = await readAuthTokenRead(stateDir);
+  const cred = credRead.value;
+  const fileToken = tokenRead.value;
+  const unreadable = credRead.unreadable || tokenRead.unreadable ? { unreadable: true } : {};
   if (fileToken) {
     const same = cred && cred.accessToken === fileToken ? cred : null;
-    return withExpiry({ token: fileToken, source: "token-file", path: tokenFilePath(stateDir) }, same, now);
+    return {
+      ...withExpiry({ token: fileToken, source: "token-file", path: tokenFilePath(stateDir) }, same, now),
+      ...unreadable
+    };
   }
   if (cred) {
-    return withExpiry(
-      { token: cred.accessToken, source: "credential-file", path: credentialFilePath(stateDir) },
-      cred,
-      now
-    );
+    return {
+      ...withExpiry(
+        { token: cred.accessToken, source: "credential-file", path: credentialFilePath(stateDir) },
+        cred,
+        now
+      ),
+      ...unreadable
+    };
   }
-  return { token: null, source: "none" };
+  return { token: null, source: "none", ...unreadable };
 }
 function withExpiry(base, cred, now) {
   if (!cred) return base;
@@ -22162,24 +22190,35 @@ import { PermissionService as PermissionService4 } from "@corenel/harness/guardr
 import { ROOT_NODE_ID } from "@corenel/protocol";
 import { makeSpawn } from "@corenel/harness/core/spawn";
 function inMemoryMemory() {
-  const items = [];
-  let n = 0;
+  const items = /* @__PURE__ */ new Map();
   return {
-    async save(text, tags = []) {
-      const it = { id: `m${++n}`, text, tags, createdAt: n };
-      items.push(it);
+    async save(input) {
+      const it = {
+        id: input.name,
+        name: input.name,
+        type: input.type,
+        description: input.description,
+        text: input.body,
+        tags: [],
+        createdAt: Date.now()
+      };
+      items.set(input.name, it);
       return it;
     },
+    async read(name) {
+      return items.get(name) ?? null;
+    },
     async recall(q) {
-      return items.filter((i) => i.text.includes(q));
+      return [...items.values()].filter((i) => i.text.includes(q) || i.description.includes(q));
     },
     async list() {
-      return [...items];
+      return [...items.values()];
     },
-    async forget(id) {
-      const i = items.findIndex((x) => x.id === id);
-      if (i >= 0) items.splice(i, 1);
+    async forget(name) {
+      items.delete(name);
     }
+    // No core(): this stub has no tiers, and Task 9 injects nothing rather than
+    // pretending it has a memory block.
   };
 }
 function inMemoryKv() {
@@ -22252,6 +22291,42 @@ function tokenGuard(getToken) {
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 var MIN_POLL_MS = 1e3;
 var DEFAULT_LIFETIME_S = 900;
+var ACCOUNT_LOOKUP_MS = 5e3;
+function deadlineSignal(ms, outer) {
+  const ac = new AbortController();
+  const onOuter = () => ac.abort();
+  const timer = setTimeout(() => ac.abort(), ms);
+  if (outer) {
+    if (outer.aborted) ac.abort();
+    else outer.addEventListener("abort", onOuter, { once: true });
+  }
+  return {
+    signal: ac.signal,
+    dispose: () => {
+      clearTimeout(timer);
+      outer?.removeEventListener("abort", onOuter);
+    }
+  };
+}
+async function whoIsThis(base, token, f, outer, deadlineMs = ACCOUNT_LOOKUP_MS) {
+  const { signal, dispose } = deadlineSignal(deadlineMs, outer);
+  try {
+    const res = await f(`${base}/auth/me`, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal
+    });
+    if (!res.ok) return void 0;
+    const body = JSON.parse(await res.text());
+    const email = body?.user?.email;
+    if (typeof email !== "string") return void 0;
+    const trimmed = email.trim();
+    return trimmed ? trimmed : void 0;
+  } catch {
+    return void 0;
+  } finally {
+    dispose();
+  }
+}
 function defaultOpen(uri, code2) {
   process.stdout.write(`
   To authorize, open:  ${uri}
@@ -22300,7 +22375,9 @@ async function deviceLogin(opts) {
       client_id: "corenel-cli"
     });
     if (tok.access_token) {
-      await opts.store(tok.access_token);
+      const claimed = typeof tok.account === "string" ? tok.account.trim() : "";
+      const account = claimed || await whoIsThis(base, tok.access_token, f, opts.signal, opts.accountLookupMs);
+      await opts.store(tok.access_token, account || void 0);
       return tok.access_token;
     }
     if (tok.error === "authorization_pending") continue;
@@ -22566,7 +22643,10 @@ async function loadCrewAgentAtIfExists(files, root, name, scope = "workspace") {
 // ../crew/runtime.ts
 import { saveCustomPolicy } from "@corenel/harness/guardrail";
 import { allTools } from "@corenel/harness/tools/builtins";
+import { registerSyncConfig, readConfigSyncRendered } from "@corenel/harness/prompts/syncConfig";
 import { makeCallAgentTool } from "@corenel/harness/tools/callAgent";
+var MEMORY_BLOCK = registerSyncConfig("crew/memory.md");
+var SELF_DIRECTION_BLOCK = registerSyncConfig("crew/self-direction.md");
 function buildSystemExtra(def, memoryLocation) {
   const parts = [];
   if (def.jobTitle?.trim()) parts.push(`--- Role ---
@@ -22580,11 +22660,7 @@ ${def.instructions.trim()}`);
   const location = memoryLocation ?? "memory/";
   const dir = location.replace(/\/+$/, "");
   const index = `${dir}/MEMORY.md`;
-  parts.push(
-    `--- Memory ---
-You keep durable notes in your own memory folder, \`${dir}/\`, one Markdown file per note, alongside \`${index}\`, an index you maintain for yourself.
-Read \`${index}\` at the start of a run to recall what you already know, and call recall_memory to look up one note by name. If you can call save_memory, use it for what is worth knowing on a later run, and keep \`${index}\` current as you do. If a file tool you have takes a \`root\` argument, you can pass \`${dir}/\` as \`root\` to read and edit those files directly.`
-  );
+  parts.push(readConfigSyncRendered(MEMORY_BLOCK, { dir, index }));
   const selfDirection = selfDirectionBlock(def);
   if (selfDirection) parts.push(selfDirection);
   return parts.join("\n\n");
@@ -22595,23 +22671,21 @@ function selfDirectionBlock(def) {
   const raw = trigger.config?.fallbackMs;
   const fallbackMs = typeof raw === "number" && Number.isFinite(raw) && raw > 0 ? raw : null;
   const consequence = fallbackMs == null ? "If this run ends without that call, nothing will wake it again and your work stops here until someone starts you by hand." : `If this run ends without that call you will be woken anyway, about ${Math.round(fallbackMs / 6e4)} minutes from now -- but that is a backstop for a run that could not schedule itself, not a substitute for choosing when you should next run.`;
-  return `--- Self-direction ---
-You run on your own schedule. You will not run again unless you call \`schedule_self\` with the time you should next wake, before this run ends.
-${consequence}
-So decide, before you finish, whether there is more to do and when it should happen.`;
+  return readConfigSyncRendered(SELF_DIRECTION_BLOCK, { consequence });
 }
 
 // ../crew/memory.ts
-import { flattenFiles as flattenFiles4 } from "@corenel/protocol";
-import { parseFact, renderFact, slugify, uniqueSlug, FACT_INDEX } from "@corenel/harness/core/factFile";
+import { makeFactStore } from "@corenel/harness/memory/store";
 
 // ../crew/room/store.ts
-import { flattenFiles as flattenFiles5 } from "@corenel/protocol";
+import { flattenFiles as flattenFiles4 } from "@corenel/protocol";
 import { encodeLine, foldSession } from "@corenel/harness/sessions/jsonl";
 import { FINDINGS_FILE, encodeFindingLine, foldFindings } from "@corenel/harness/rooms/findings";
 
 // ../crew/room/prompt.ts
+import { registerSyncConfig as registerSyncConfig2, readConfigSyncRendered as readConfigSyncRendered2 } from "@corenel/harness/prompts/syncConfig";
 import { MAX_ROOM_FINDINGS, renderFindings } from "@corenel/harness/rooms/findings";
+var ROOM_BLOCK = registerSyncConfig2("crew/room.md");
 
 // ../crew/room/turn.ts
 import { readRoomOutcome } from "@corenel/harness/tools/roomTools";
@@ -24245,10 +24319,14 @@ async function main() {
       }
       case "login": {
         const base = await apiBase(flag(rest, "base", ""));
-        await deviceLogin({ base, store: (token) => writeLoginCredential(token, { apiBase: base }) });
+        await deviceLogin({
+          base,
+          store: (token, account) => writeLoginCredential(token, { apiBase: base, ...account ? { account } : {} })
+        });
         process.stdout.write(`
 Logged in. Token saved to ${authTokenPath()}
 `);
+        process.stdout.write("If a sidecar daemon is already running, restart it to sign it in as well.\n");
         break;
       }
       case "auth":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corenel/cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "description": "Corenel CLI — runs the harness in node, in-proc, no transport. The headless proof the kernel is host-agnostic. (corenel run/ask/chat/login + start --sidecar to follow.)",
   "bin": {
@@ -9,9 +9,9 @@
   "dependencies": {
     "openai": "^4.77.0",
     "ws": "^8.18.0",
-    "@corenel/harness": "0.6.0",
-    "@corenel/protocol": "0.6.0",
-    "@corenel/term": "0.2.2"
+    "@corenel/harness": "0.6.1",
+    "@corenel/term": "0.2.3",
+    "@corenel/protocol": "0.6.1"
   },
   "devDependencies": {
     "esbuild": "^0.21.5",
@@ -19,8 +19,8 @@
     "@types/ws": "^8.5.13",
     "tsx": "^4.19.2",
     "typescript": "^5.9.3",
-    "@corenel/tools-node": "0.3.0",
-    "@corenel/crew": "0.0.0"
+    "@corenel/crew": "0.0.0",
+    "@corenel/tools-node": "0.3.1"
   },
   "publishConfig": {
     "access": "public"