worktrust 0.4.1 → 0.6.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 WorkTrust
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -4,16 +4,16 @@ Couple a computer to [WorkTrust](https://worktrust.io) in one command. WorkTrust
 record of the work you do with AI without anyone reading that work: it receives metadata only.
 
 ```
-npx worktrust connect
+npx worktrust
 ```
 
 **The only official package** is `worktrust`, published by the npm account **worktrustio** with
 provenance from this repository (github.com/fhomey/worktrust-cli). Check it on npmjs.com before you run
-it; a package of another name or from another publisher is not ours. Until the first version is on npm,
-use the same script from WorkTrust's own site:
+it; a package of another name or from another publisher is not ours. Without npm, the same script runs
+from WorkTrust's own site:
 
 ```
-curl -fsSO https://app.worktrust.io/counter/worktrust.mjs && node worktrust.mjs connect
+curl -fsSO https://app.worktrust.io/counter/worktrust.mjs && node worktrust.mjs
 ```
 
 ## What happens
@@ -32,8 +32,12 @@ curl -fsSO https://app.worktrust.io/counter/worktrust.mjs && node worktrust.mjs
 3. **The terminal finishes by itself.** It keeps the key in its private file and gives every
    AI app here the WorkTrust door, then installs the session hook. Quit your AI apps and open them
    again.
+4. **Earlier work only if you say yes.** It counts the Claude Code and Codex sessions already on
+   this computer and asks `Send these as history? [y/N]`. Enter sends nothing. What goes is hours
+   and tokens per day, never text, and WorkTrust shows it as earlier work, never as verified hours.
 
 ```
+npx worktrust history       send this computer's earlier sessions later (asks first)
 npx worktrust status        what is coupled here
 npx worktrust disconnect    take it out again (shows the plan, asks first)
 ```
@@ -54,7 +58,7 @@ which would delete every password on the computer, and many people rightly keep
   signature. A key that leaks without the file, from a log, a proxy or a config, is worth nothing.
 - **The key renews itself every week.** A new secret is made here, only its hash is sent, signed,
   and last week's key stops working.
-- `npx worktrust connect --direct` writes a plain key into the apps' settings instead, for an app
+- `npx worktrust --direct` writes a plain key into the apps' settings instead, for an app
   that cannot run a local command. Such a key is not bound to the computer and does not renew.
 
 ## What it reads, writes and sends
@@ -93,3 +97,8 @@ Then revoke the key in WorkTrust: Sources → Devices → this computer → Revo
 Node 18 or later. macOS, Linux or Windows.
 
 Security reports: see [SECURITY.md](SECURITY.md).
+
+## Licence
+
+MIT, for this command-line tool only (see LICENSE). The WorkTrust service it couples to is not
+open source.

package/log-session.mjs

@@ -23,6 +23,7 @@
  *   node log-session.mjs --uninstall [--purge] take it out again (--purge also deletes the copies)
  *   node log-session.mjs --dry-run            show what the current transcripts would send
  *   node log-session.mjs --history [--dry-run] send the months already on this machine, as HISTORY
+ *   node log-session.mjs --history --summary   one JSON line: sessions, hours, first and last month (sends nothing)
  *   (as a hook)                                reads the hook's JSON on stdin, logs, exits
  *   (from Codex)                               notify = ["node", "~/.worktrust/log-session.mjs", "--codex-notify"]
  *                                              in ~/.codex/config.toml: Codex calls it at every turn's end and
@@ -587,6 +588,7 @@ function historyEntries() {
         from: messages[0].at, to: last,
       });
       if (CODEX_ROLLOUT.test(file)) entrySource.set(entry, "codex");
+      entryFile.set(entry, file);
       entries.push(entry);
       void day;
     }
@@ -765,12 +767,15 @@ const door = coupling();
 const codexDoor = codexCoupling();
 const doorFor = (entry) => (String(entry?.id ?? "").startsWith("codex:") ? codexDoor ?? door : door);
 const entrySource = new WeakMap(); // a history entry → "codex" when its rollout was Codex's; sendHistory routes by it
+const entryFile = new WeakMap(); // a history entry → its transcript, so `--summary` can count sessions
 if (!door && !codexDoor && !DRY) { process.exit(0); } // Not coupled on this machine: nothing to do, quietly.
 
 if (flag("history")) {
   const entries = historyEntries();
   const hours = entries.reduce((sum, entry) => sum + (entry.seconds ?? 0), 0) / 3600;
   const months = [...new Set(entries.map((entry) => entry.at.slice(0, 7)))].sort();
+  // ONE LINE FOR `npx worktrust` TO ASK WITH (2026-10-03): sessions, hours, first and last month; nothing sent.
+  if (flag("summary")) { console.log(JSON.stringify({ sessions: new Set(entries.map((entry) => entryFile.get(entry))).size, hours: Math.round(hours * 10) / 10, first: months[0] ?? null, last: months.at(-1) ?? null })); process.exit(0); }
   console.log(`${entries.length} day-stretches · ${hours.toFixed(1)} measured hours · ${months.join(", ")}`);
   if (DRY) {
     // One example in full: the shape is the argument for trusting it, and a summary hides it.
@@ -778,8 +783,8 @@ if (flag("history")) {
     console.log("\ndry run — nothing sent. Add --history without --dry-run to import them.");
     process.exit(0);
   }
-  await sendHistory(door, entries, true);
-  process.exit(0);
+  // A batch the door refused is a failure the caller must see, not a quiet zero.
+  process.exit((await sendHistory(door, entries, true)) === entries.length ? 0 : 1);
 }
 
 const input = hookInput();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktrust",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "description": "Couple this computer to WorkTrust: approve a code in your browser, and every AI app here reports what you built. Metadata only, no dependencies.",
   "type": "module",
   "bin": {
@@ -12,12 +12,13 @@
     "log-session.mjs",
     "count-behaviour.mjs",
     "README.md",
-    "SECURITY.md"
+    "SECURITY.md",
+    "LICENSE"
   ],
   "engines": {
     "node": ">=18"
   },
-  "license": "UNLICENSED",
+  "license": "MIT",
   "homepage": "https://worktrust.io",
   "keywords": [
     "worktrust",

package/worktrust.mjs

@@ -2,10 +2,13 @@
 /**
  * WorkTrust on a computer, in one command — like `gh auth login` (2026-10-03).
  *
- *   npx worktrust connect               show the plan, ask, approve a code in the app, couple
- *   npx worktrust connect --dry-run     show the plan only; nothing is written, nothing is sent
- *   npx worktrust connect --yes         no question (for scripts); the computer is still approved in the app
- *   npx worktrust connect --device      a computer without a browser (SSH): type a code on another device
+ *   npx worktrust                       show the plan, ask, approve this computer in the app, couple;
+ *                                       on a computer already coupled: what is coupled here
+ *   npx worktrust --dry-run             show the plan only; nothing is written, nothing is sent
+ *   npx worktrust --yes                 no question (for scripts); the computer is still approved in the app
+ *   npx worktrust --device              a computer without a browser (SSH): type a code on another device
+ *   npx worktrust connect               couple again, also on a computer already coupled
+ *   npx worktrust history               send this computer's earlier sessions as history (asks first)
  *   npx worktrust disconnect            show what comes out, ask, take it out again
  *   npx worktrust status                what is coupled here
  *
@@ -56,7 +59,7 @@ import { fileURLToPath } from "node:url";
 
 const args = process.argv.slice(2);
 const VALUED = ["--name", "--origin", "--url"];
-const command = args.find((arg, at) => !arg.startsWith("--") && !(at > 0 && VALUED.includes(args[at - 1]))) ?? "help";
+const command = args.find((arg, at) => !arg.startsWith("--") && !(at > 0 && VALUED.includes(args[at - 1]))) ?? (args.includes("--help") ? "help" : "default");
 const flag = (name) => { const at = args.indexOf(`--${name}`); return at >= 0 ? args[at + 1] : undefined; };
 const has = (name) => args.includes(`--${name}`);
 const ORIGIN = (flag("origin") ?? process.env.WORKTRUST_ORIGIN ?? "https://app.worktrust.io").replace(/\/$/, "");
@@ -93,9 +96,9 @@ async function scripts() {
 }
 
 /** Run a script; its output is shown, or collected for the plan. The key travels in the environment only. */
-function run(path, scriptArgs, token, collect = false) {
+function run(path, scriptArgs, token, collect = false, extraEnv = {}) {
   return new Promise((resolve) => {
-    const child = spawn(process.execPath, [path, ...scriptArgs], { stdio: collect ? ["ignore", "pipe", "pipe"] : "inherit", env: { ...process.env, WORKTRUST_MCP_URL: MCP, WORKTRUST_MCP_TOKEN: token, WORKTRUST_NODE: NODE } });
+    const child = spawn(process.execPath, [path, ...scriptArgs], { stdio: collect ? ["ignore", "pipe", "pipe"] : "inherit", env: { ...process.env, WORKTRUST_MCP_URL: MCP, WORKTRUST_MCP_TOKEN: token, WORKTRUST_NODE: NODE, ...extraEnv } });
     let out = "";
     child.stdout?.on("data", (chunk) => { out += chunk; });
     child.stderr?.on("data", (chunk) => { out += chunk; });
@@ -103,13 +106,14 @@ function run(path, scriptArgs, token, collect = false) {
   });
 }
 
-async function ask(question) {
-  if (has("yes")) return true;
+/** `yes` is the answer Enter gives, and the one `--yes` gives: a question whose default is No stays No under --yes. */
+async function ask(question, yes = true) {
+  if (has("yes")) return yes;
   if (!process.stdin.isTTY) fail("not a terminal: nothing was changed. Run it in a terminal, or add --yes to agree in advance.");
   const prompt = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = (await prompt.question(`  ${question} [Y/n] `)).trim().toLowerCase();
+  const answer = (await prompt.question(`  ${question} ${yes ? "[Y/n]" : "[y/N]"} `)).trim().toLowerCase();
   prompt.close();
-  return answer === "" || answer === "y" || answer === "yes";
+  return answer === "" ? yes : answer === "y" || answer === "yes";
 }
 
 function openBrowser(url) {
@@ -396,11 +400,38 @@ async function connect() {
   say();
   const hookArgs = ["--install", ...(BUNDLED ? ["--counter", paths["count-behaviour.mjs"]] : []), ...(direct ? [] : ["--via", STABLE])];
   if ((await run(paths["log-session.mjs"], hookArgs, token)).code !== 0) fail("installing the session hook failed; the output above says where.");
+  await offerHistory(paths, token, device ? device.privateKey.export({ format: "pem", type: "pkcs8" }) : null);
   say();
   say("  Done. Quit your AI apps completely and open them again. This computer appears in WorkTrust");
   say("  under Sources → Devices once one of them has spoken.");
 }
 
+/**
+ * EARLIER WORK IS SENT ONLY ON A YES (owner, 2026-10-03). After coupling, or as `npx worktrust history`:
+ * what this computer holds is counted here and shown, and nothing leaves before the person types y.
+ * Enter, --yes and a closed terminal all mean No; `--history` says yes in advance. What goes is hours
+ * and tokens per day, filed as history (never verified hours, never text).
+ */
+async function offerHistory(paths, token, devicePem, url = MCP) {
+  const env = { WORKTRUST_MCP_URL: url, ...(devicePem ? { WORKTRUST_DEVICE_KEY: devicePem } : {}) };
+  const counted = await run(paths["log-session.mjs"], ["--history", "--dry-run", "--summary"], token, true, env);
+  let found = null;
+  try { found = JSON.parse(counted.out.trim().split("\n").pop()); } catch { /* no line: nothing to offer */ }
+  say();
+  if (!found?.sessions) { say("  No earlier Claude Code or Codex sessions on this computer to send."); return; }
+  say(`  This computer holds ${found.sessions} earlier Claude Code / Codex sessions · ${found.hours} measured hours · ${found.first} … ${found.last}.`);
+  if (has("dry-run")) { say("  Dry run: nothing was sent."); return; }
+  if (!has("history") && !(await ask("Send these as history (hours and tokens per day; never text)?", false))) { say("  Not sent. Send them later with: npx worktrust history"); return; }
+  const sent = await run(paths["log-session.mjs"], ["--history"], token, true, env);
+  say(sent.code === 0 ? "  ✓ Sent as history. It shows in WorkTrust as earlier work, never as verified hours." : "  Not all of it arrived. Run npx worktrust history again: a line already received is kept once.");
+}
+
+async function history() {
+  const key = await freshKey();
+  if (!key) fail("this computer is not coupled through the key file. Run npx worktrust first.");
+  await offerHistory(await scripts(), key.token, key.device ?? null, key.url);
+}
+
 async function disconnect() {
   say();
   say(`  WorkTrust · disconnect ${hostname().replace(/\.local$/i, "")}`);
@@ -432,7 +463,7 @@ function status() {
     for (const project of Object.values(config.projects ?? {})) Object.assign(servers, project.mcpServers ?? {});
   } catch { /* no Claude Code here */ }
   const door = Object.entries(servers).find(([name, server]) => /worktrust/i.test(`${name} ${server?.url ?? ""} ${(server?.args ?? []).join(" ")}`));
-  say(door ? `  Claude Code: coupled (${door[1].url ?? "through the local bridge"})` : "  Claude Code: not coupled. Run `worktrust connect`.");
+  say(door ? `  Claude Code: coupled (${door[1].url ?? "through the local bridge"})` : "  Claude Code: not coupled. Run `npx worktrust connect`.");
   const key = keyStore.load();
   say(key ? `  Key: in ${KEY_PLACE}, ${key.device ? "bound to this computer, " : ""}last renewed ${String(key.renewedAt ?? "").slice(0, 10) || "never"}` : "  Key: not on this computer (or written into the apps' settings with --direct)");
   let hook = false;
@@ -444,19 +475,27 @@ function status() {
 function help() {
   say("WorkTrust: couple this computer to your record. Metadata only.");
   say();
-  say("  worktrust connect      show the plan, ask, approve a code in your browser, couple");
+  say("  worktrust              couple this computer: show the plan, ask, approve in your browser");
+  say("                         (already coupled: shows what is coupled here)");
   say("    --dry-run            the plan only: nothing is written, nothing is sent");
   say("    --yes                no question (the computer is still approved in the browser)");
   say("    --device             no browser here (SSH): type a code on another device");
   say("    --name <name>        the name this computer gets (default: its host name)");
   say("    --direct             put the key in each app's settings instead of the key file");
+  say("  worktrust connect      couple again, also when this computer is already coupled");
+  say("  worktrust history      send this computer's earlier sessions as history (asks first)");
   say("  worktrust disconnect   take WorkTrust out of every AI app here (asks first)");
   say("  worktrust status       what is coupled here");
 }
 
-if (command === "mcp") await bridge();
+// THE BARE COMMAND COUPLES (owner, 2026-10-03: "zo kort mogelijk"). `npx worktrust` on a computer
+// without a key here shows the plan and asks, exactly as `connect` does; with one it says what is
+// coupled, so running it twice never re-pairs by surprise.
+if (command === "default") { if (keyStore.load()) { status(); say(); say("  This computer is coupled. `npx worktrust connect` couples it again; `npx worktrust disconnect` takes it out."); } else await connect(); }
+else if (command === "mcp") await bridge();
 else if (command === "hook") await hook();
 else if (command === "connect") await connect();
+else if (command === "history") await history();
 else if (command === "disconnect") await disconnect();
 else if (command === "status") status();
 else help();