pinomad 0.11.0 → 0.13.0

package/dist/{chunk-xqycs43g.js → chunk-kmzzjv53.js}

@@ -187,7 +187,7 @@ var conversationStream = (id) => `conversation:${id}`;
 var docStream = (kind, id) => `doc:${kind}:${id}`;
 var UNAUTHORIZED_CLOSE_CODE = 4401;
 var INVALID_FRAME_CLOSE_CODE = 4400;
-var PROTOCOL = { major: 5, minor: 25 };
+var PROTOCOL = { major: 5, minor: 29 };
 var CALL_SINCE = {
   addProject: 0,
   removeProject: 0,
@@ -202,6 +202,7 @@ var CALL_SINCE = {
   submission: 25,
   withdrawQueued: 14,
   steerQueued: 14,
+  reorderQueued: 29,
   abort: 0,
   compact: 0,
   runCommand: 17,
@@ -226,10 +227,17 @@ var CALL_SINCE = {
   deleteAgent: 6,
   setPushToken: 7,
   image: 15,
+  earlierEntries: 28,
   beginAttachment: 19,
   appendAttachment: 19,
   rtcOffer: 23,
-  ping: 23
+  ping: 23,
+  openTerminal: 27,
+  terminalInput: 27,
+  resizeTerminal: 27,
+  renameTerminal: 27,
+  restartTerminal: 27,
+  closeTerminal: 27
 };
 function hostSupportsCall(hostMinor, method) {
   return hostMinor >= CALL_SINCE[method];
@@ -246,7 +254,9 @@ var FEATURE_SINCE = {
   attachments: 19,
   imageVariants: 20,
   rtc: 23,
-  submitEntry: 25
+  submitEntry: 25,
+  terminals: 27,
+  transcriptPaging: 28
 };
 function hostSupportsFeature(hostMinor, feature) {
   return hostMinor >= FEATURE_SINCE[feature];
@@ -259,8 +269,27 @@ function parseClientFrame(value) {
     if (typeof stream !== "string")
       return { kind: "malformed" };
     if (isStreamName(stream)) {
-      const refs = value.type === "subscribe" && value.images === "ref";
-      return { kind: "frame", frame: refs ? { type: "subscribe", stream, images: "ref" } : { type: value.type, stream } };
+      if (value.type === "unsubscribe")
+        return { kind: "frame", frame: { type: "unsubscribe", stream } };
+      if (stream.startsWith("terminal:") && value.since !== undefined) {
+        const since = value.since;
+        if (typeof since !== "number" || !Number.isSafeInteger(since) || since < 0)
+          return { kind: "malformed" };
+        return { kind: "frame", frame: { type: "subscribe", stream, since } };
+      }
+      const refs = value.images === "ref";
+      let window;
+      if (stream.startsWith("conversation:") && value.window !== undefined) {
+        if (!record(value.window) || !positive(value.window.limit) || !(value.window.from === undefined || positive(value.window.from))) {
+          return { kind: "malformed" };
+        }
+        const limit = value.window.limit;
+        window = value.window.from === undefined ? { limit } : { limit, from: value.window.from };
+      }
+      return {
+        kind: "frame",
+        frame: { type: "subscribe", stream, ...refs ? { images: "ref" } : {}, ...window === undefined ? {} : { window } }
+      };
     }
     const prefix = stream.slice(0, stream.indexOf(":") === -1 ? undefined : stream.indexOf(":"));
     if (STREAM_KINDS.has(prefix))
@@ -277,9 +306,9 @@ function parseClientFrame(value) {
     return { kind: "unsupportedCall", id, method };
   return validCallArgs(method, args) ? { kind: "frame", frame: { type: "call", id, method, args } } : { kind: "malformed" };
 }
-var STREAM_KINDS = new Set(["conversation", "doc", "tasks", ...HOST_STREAM_NAMES]);
+var STREAM_KINDS = new Set(["conversation", "doc", "tasks", "terminals", "terminal", ...HOST_STREAM_NAMES]);
 function isStreamName(stream) {
-  return stream === "tasks" || HOST_STREAM_NAMES.includes(stream) || /^(?:conversation:|doc:.+:)[1-9]\d*$/.test(stream);
+  return stream === "tasks" || HOST_STREAM_NAMES.includes(stream) || /^(?:conversation:|doc:.+:|terminals:)[1-9]\d*$/.test(stream) || /^terminal:[\w-]+$/.test(stream);
 }
 var isCallMethod = (method) => CALL_METHODS.includes(method);
 var CALL_METHODS = Object.keys(CALL_SINCE);
@@ -299,7 +328,20 @@ function validCallArgs(method, args) {
   const skills = () => args.skills === undefined || Array.isArray(args.skills) && args.skills.every(nonempty);
   const attachments = () => args.attachments === undefined || Array.isArray(args.attachments) && args.attachments.every(nonempty);
   const role = () => record(args.role) && typeof args.role.name === "string" && typeof args.role.description === "string" && typeof args.role.prompt === "string" && (args.role.model === undefined || typeof args.role.model === "string") && (args.role.thinkingLevel === undefined || typeof args.role.thinkingLevel === "string");
+  const terminalId = () => nonempty(args.terminalId);
+  const size = () => [args.cols, args.rows].every((n) => typeof n === "number" && Number.isSafeInteger(n) && n >= 1);
   switch (method) {
+    case "openTerminal":
+      return conversationId() && size();
+    case "terminalInput":
+      return terminalId() && typeof args.data === "string";
+    case "resizeTerminal":
+    case "restartTerminal":
+      return terminalId() && size();
+    case "renameTerminal":
+      return terminalId() && (args.name === null || typeof args.name === "string");
+    case "closeTerminal":
+      return terminalId();
     case "submit":
       return conversationId() && typeof args.text === "string" && (args.whenBusy === "steer" || args.whenBusy === "followUp") && nonempty(args.requestId) && images() && skills() && attachments();
     case "submission":
@@ -307,6 +349,8 @@ function validCallArgs(method, args) {
     case "withdrawQueued":
     case "steerQueued":
       return conversationId() && submissionId();
+    case "reorderQueued":
+      return conversationId() && submissionId() && (args.before === undefined || typeof args.before === "number" && Number.isSafeInteger(args.before) && args.before >= 1);
     case "abort":
       return conversationId();
     case "setThinkingLevel":
@@ -327,6 +371,8 @@ function validCallArgs(method, args) {
       return conversationId() && nonempty(args.kind) && nonempty(args.requestId) && Array.isArray(args.answers) && args.answers.every((answer) => record(answer) && Array.isArray(answer.selected) && answer.selected.every((l) => typeof l === "string") && (answer.other === undefined || typeof answer.other === "string"));
     case "changes":
       return conversationId();
+    case "earlierEntries":
+      return conversationId() && positive(args.before) && positive(args.limit);
     case "image":
       return nonempty(args.ref) && (args.variant === undefined || args.variant === "thumbnail" || args.variant === "preview");
     case "beginAttachment":
@@ -383,6 +429,9 @@ function validCallArgs(method, args) {
 function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
+function positive(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 1;
+}
 function nonempty(value) {
   return typeof value === "string" && value.length > 0;
 }
@@ -619,4 +668,30 @@ function homeOf(index, summaries, id) {
   return;
 }
 
-export { rtcSelectedPair, RTC_DEFAULT_STUN, RTC_DATA_CHANNEL_LABEL, RTC_MAX_RECORD_BYTES, isRtcHello, rtcCandidateType, sdpCandidates, withRtcCandidates, parseRtcMaxMessageSize, isCustomProviderApi, HOST_STREAM_NAMES, hostStreams, conversationStream, docStream, UNAUTHORIZED_CLOSE_CODE, INVALID_FRAME_CLOSE_CODE, PROTOCOL, hostSupportsCall, hostSupportsFeature, parseClientFrame, MAX_ATTACHMENTS_PER_MESSAGE, MAX_PENDING_ATTACHMENTS, MAX_PENDING_ATTACHMENT_BYTES, ATTACHMENT_TTL_MS, MAX_ATTACHMENT_NAME_LENGTH, isAttachmentId, base64DecodedLength, attachmentBeginProblem, attachmentChunkProblem, attachmentBlock, parseAttachmentBlock, organize, checkoutOf, homeOf };
+// packages/protocol/src/transcript.ts
+var TRANSCRIPT_PAGE = 50;
+var MAX_TRANSCRIPT_PAGE = 500;
+function withEarlier(view, earlier) {
+  if (earlier === undefined)
+    return view;
+  const { before: _window, ...rest } = view;
+  return {
+    ...rest,
+    entries: [...earlier.entries, ...view.entries],
+    ...earlier.before === undefined ? {} : { before: earlier.before }
+  };
+}
+function addEarlier(shown, earlier, requested, page) {
+  if (shown.before !== requested)
+    return earlier;
+  return {
+    entries: [...page.entries, ...earlier?.entries ?? []],
+    ...page.before === undefined ? {} : { before: page.before }
+  };
+}
+function isBusy(view) {
+  const live = view.docs?.["pi.live"];
+  return live?.run !== undefined;
+}
+
+export { rtcSelectedPair, RTC_DEFAULT_STUN, RTC_DATA_CHANNEL_LABEL, RTC_MAX_RECORD_BYTES, isRtcHello, rtcCandidateType, sdpCandidates, withRtcCandidates, parseRtcMaxMessageSize, isCustomProviderApi, HOST_STREAM_NAMES, hostStreams, conversationStream, docStream, UNAUTHORIZED_CLOSE_CODE, INVALID_FRAME_CLOSE_CODE, PROTOCOL, hostSupportsCall, hostSupportsFeature, parseClientFrame, MAX_ATTACHMENTS_PER_MESSAGE, MAX_PENDING_ATTACHMENTS, MAX_PENDING_ATTACHMENT_BYTES, ATTACHMENT_TTL_MS, MAX_ATTACHMENT_NAME_LENGTH, isAttachmentId, base64DecodedLength, attachmentBeginProblem, attachmentChunkProblem, attachmentBlock, parseAttachmentBlock, organize, checkoutOf, homeOf, TRANSCRIPT_PAGE, MAX_TRANSCRIPT_PAGE, withEarlier, addEarlier, isBusy };

package/dist/{chunk-4dcs8sbj.js → chunk-m51mq8vh.js}

@@ -3,32 +3,35 @@ import {
   assertSecureServerOrigin,
   probeServerAccounts,
   runServerOperation
-} from "./chunk-ncbqa8jk.js";
+} from "./chunk-7mn38n4f.js";
 import {
   loadHostKey,
   loadRelayKey
 } from "./chunk-t91zt5f0.js";
 import {
+  readRemovalNotice,
   readServerConfig,
   removeServerConfig
-} from "./chunk-etf7ef97.js";
+} from "./chunk-nq57fdnq.js";
 import {
   relayHostId
-} from "./chunk-y127fe1a.js";
+} from "./chunk-g3ahp7b9.js";
 import {
   argValue,
   restartService,
   serviceManager,
   withoutRelayArgs
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-wd7aracm.js";
+import"./chunk-4fferbxw.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-kmzzjv53.js";
 import"./chunk-pqe7q1s7.js";
 import {
   DEFAULT_DATA_DIR
 } from "./chunk-ngf1zatm.js";
-import"./chunk-sd5fkxjj.js";
+import {
+  commandHint
+} from "./chunk-s0h7c7da.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/leave.ts
@@ -39,8 +42,13 @@ var message = (error) => error instanceof Error ? error.message : String(error);
 async function leaveServer(args, deps) {
   const dataDir = resolve(args.dataDir);
   const config = await readServerConfig(dataDir);
-  if (config === undefined)
-    throw new Error(`not joined — no server.json in ${dataDir}`);
+  if (config === undefined) {
+    const removed = await readRemovalNotice(dataDir);
+    if (removed === undefined)
+      throw new Error(`not joined — no server.json in ${dataDir}`);
+    await removeServerConfig(dataDir);
+    return { origin: removed.origin, warnings: [], notes: ["the account had already removed this host"] };
+  }
   const origin = config.origin;
   const warnings = [];
   const notes = [];
@@ -78,7 +86,10 @@ async function leaveServer(args, deps) {
   await removeServerConfig(dataDir);
   const manager = deps?.manager ?? serviceManager();
   try {
-    const installed = await manager.state().then((state) => state.installed, () => false);
+    const state = await manager.state().catch(() => {
+      return;
+    });
+    const installed = state?.installed === true;
     const previous = installed ? await manager.read() : undefined;
     if (!installed) {
       notes.push("no service installed — restart any running host so it stops dialing the server");
@@ -87,19 +98,30 @@ async function leaveServer(args, deps) {
     } else {
       const stripped = previous === undefined ? undefined : { ...previous, hostArgs: withoutRelayArgs(previous.hostArgs) };
       const rewriting = stripped !== undefined && stripped.hostArgs.length !== previous.hostArgs.length;
-      const port = argValue(previous?.hostArgs ?? [], "--port");
-      const code = await restartService({
-        force: false,
-        argv: ["--data-dir", dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]],
-        manager,
-        ...rewriting ? {
-          restart: async () => {
+      if (state.stopped) {
+        if (rewriting) {
+          try {
             await manager.install(stripped);
+          } finally {
+            await manager.stop();
           }
-        } : {}
-      });
-      if (code !== 0)
-        warnings.push("the service restart did not finish — check `service status`");
+        }
+        notes.push(`the service is stopped and stays off until \`${commandHint("service")} start\``);
+      } else {
+        const port = argValue(previous?.hostArgs ?? [], "--port");
+        const code = await restartService({
+          force: false,
+          argv: ["--data-dir", dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]],
+          manager,
+          ...rewriting ? {
+            restart: async () => {
+              await manager.install(stripped);
+            }
+          } : {}
+        });
+        if (code !== 0)
+          warnings.push("the service restart did not finish — check `service status`");
+      }
     }
   } catch (error) {
     warnings.push(`could not update the service definition: ${message(error)} — remove --relay from it and restart manually`);

package/dist/{chunk-tj57aqav.js → chunk-maqv34cs.js}

@@ -1,7 +1,7 @@
 import {
   connectRemoteDurable
-} from "./chunk-jt34g8st.js";
-import"./chunk-xqycs43g.js";
+} from "./chunk-4fferbxw.js";
+import"./chunk-kmzzjv53.js";
 import {
   isLoopbackUrl
 } from "./chunk-pqe7q1s7.js";

package/dist/chunk-nq57fdnq.js

@@ -0,0 +1,106 @@
+// apps/host/src/server-config.ts
+import { randomBytes } from "node:crypto";
+import { readFile, rename, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+var SERVER_CONFIG_FILE = "server.json";
+var REMOVAL_NOTICE_FILE = "server-removed.json";
+var normalizeOrigin = (origin) => origin.replace(/\/+$/, "");
+async function readServerConfig(dataDir) {
+  const config = await readServerConfigAt(join(dataDir, SERVER_CONFIG_FILE));
+  if (config === undefined)
+    return;
+  const notice = await readRemovalNotice(dataDir).catch(() => {
+    return;
+  });
+  return notice !== undefined && endsJoin(notice, config) ? undefined : config;
+}
+var endsJoin = (notice, config) => normalizeOrigin(notice.origin) === normalizeOrigin(config.origin) && notice.binding === config.binding;
+async function readServerConfigAt(path) {
+  let text;
+  try {
+    text = await readFile(path, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT")
+      return;
+    throw error;
+  }
+  let value;
+  try {
+    value = JSON.parse(text);
+  } catch {
+    throw new Error(`${path} is not valid JSON — delete it or run \`pinomad leave\``);
+  }
+  const origin = value?.origin;
+  if (typeof origin !== "string" || origin.trim() === "") {
+    throw new Error(`${path} is missing a string "origin"`);
+  }
+  const { binding, username } = value;
+  return {
+    origin,
+    ...typeof binding === "string" && binding !== "" ? { binding } : {},
+    ...typeof username === "string" && username !== "" ? { username } : {}
+  };
+}
+async function writeJsonFile(path, value) {
+  const tmp = `${path}.tmp-${process.pid}`;
+  await writeFile(tmp, `${JSON.stringify(value)}
+`, { mode: 384 });
+  await rename(tmp, path);
+}
+async function writeServerConfig(dataDir, config) {
+  await writeJsonFile(join(dataDir, SERVER_CONFIG_FILE), {
+    origin: normalizeOrigin(config.origin),
+    binding: randomBytes(16).toString("base64url"),
+    ...config.username === undefined ? {} : { username: config.username }
+  });
+  await rm(join(dataDir, REMOVAL_NOTICE_FILE), { force: true });
+}
+async function markRemoved(dataDir, removed, removedAt = Date.now()) {
+  await writeJsonFile(join(dataDir, REMOVAL_NOTICE_FILE), {
+    origin: normalizeOrigin(removed.origin),
+    ...removed.binding === undefined ? {} : { binding: removed.binding },
+    ...removed.username === undefined ? {} : { username: removed.username },
+    removedAt
+  });
+}
+async function readRemovalNotice(dataDir) {
+  const path = join(dataDir, REMOVAL_NOTICE_FILE);
+  let text;
+  try {
+    text = await readFile(path, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT")
+      return;
+    throw error;
+  }
+  let value;
+  try {
+    value = JSON.parse(text);
+  } catch {
+    throw new Error(`${path} is not valid JSON — delete it`);
+  }
+  const { origin, binding, username, removedAt } = value ?? {};
+  if (typeof origin !== "string" || typeof removedAt !== "number")
+    throw new Error(`${path} is missing "origin" or "removedAt" — delete it`);
+  return {
+    origin,
+    ...typeof binding === "string" && binding !== "" ? { binding } : {},
+    ...typeof username === "string" && username !== "" ? { username } : {},
+    removedAt
+  };
+}
+async function removeServerConfig(dataDir) {
+  await rm(join(dataDir, SERVER_CONFIG_FILE), { force: true });
+  await rm(join(dataDir, REMOVAL_NOTICE_FILE), { force: true });
+}
+async function readServerBinding(dataDir) {
+  return (await readServerConfig(dataDir))?.binding;
+}
+function resolveRelayOrigin(flag, config) {
+  if (flag !== undefined && config !== undefined && normalizeOrigin(flag) !== normalizeOrigin(config.origin)) {
+    throw new Error(`--relay ${flag} disagrees with ${SERVER_CONFIG_FILE} (${config.origin}) — remove one`);
+  }
+  return flag ?? config?.origin;
+}
+
+export { REMOVAL_NOTICE_FILE, normalizeOrigin, readServerConfig, writeServerConfig, markRemoved, readRemovalNotice, removeServerConfig, readServerBinding, resolveRelayOrigin };

package/dist/{chunk-h5q2y57m.js → chunk-ra86wjp5.js}

@@ -3,17 +3,23 @@ import {
   main,
   reachabilityLine,
   restartService,
+  serviceStatusJson,
+  startService,
+  stopService,
   versionLine
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-wd7aracm.js";
+import"./chunk-4fferbxw.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-kmzzjv53.js";
 import"./chunk-pqe7q1s7.js";
 import"./chunk-ngf1zatm.js";
-import"./chunk-sd5fkxjj.js";
+import"./chunk-s0h7c7da.js";
 import"./chunk-df32avw6.js";
 export {
   versionLine,
+  stopService,
+  startService,
+  serviceStatusJson,
   restartService,
   reachabilityLine,
   main

package/dist/{chunk-sd5fkxjj.js → chunk-s0h7c7da.js}

@@ -1,6 +1,6 @@
 // apps/host/src/distribution.ts
 import { fileURLToPath } from "node:url";
-var packagedVersion = "0.11.0";
+var packagedVersion = "0.13.0";
 var webRoot = fileURLToPath(new URL(packagedVersion === undefined ? "../../web/dist" : "../web/", import.meta.url));
 var hostEntry = packagedVersion === undefined ? { script: fileURLToPath(new URL("./main.ts", import.meta.url)), args: [] } : { script: fileURLToPath(new URL("./pinomad.js", import.meta.url)), args: ["host"] };
 var commandHint = (name) => packagedVersion === undefined ? `bun run ${name}` : `pinomad ${name}`;

package/dist/chunk-sd640dt7.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+import {
+  joinServer,
+  main
+} from "./chunk-d9mq5d46.js";
+import"./chunk-7mn38n4f.js";
+import"./chunk-563fnad9.js";
+import"./chunk-t91zt5f0.js";
+import"./chunk-nq57fdnq.js";
+import"./chunk-g3ahp7b9.js";
+import"./chunk-wd7aracm.js";
+import"./chunk-4fferbxw.js";
+import"./chunk-kzbzacz9.js";
+import"./chunk-kmzzjv53.js";
+import"./chunk-pqe7q1s7.js";
+import"./chunk-ngf1zatm.js";
+import"./chunk-s0h7c7da.js";
+import"./chunk-df32avw6.js";
+export {
+  main,
+  joinServer
+};

package/dist/{chunk-6d16c2fv.js → chunk-t6fw0wa9.js}

@@ -2,19 +2,20 @@
 import {
   restartService,
   serviceManager
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-wd7aracm.js";
+import"./chunk-4fferbxw.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-kmzzjv53.js";
 import"./chunk-pqe7q1s7.js";
 import {
   hostAddressOptions
 } from "./chunk-ngf1zatm.js";
 import {
+  commandHint,
   globalPrefixOf,
   packageDir,
   packagedVersion
-} from "./chunk-sd5fkxjj.js";
+} from "./chunk-s0h7c7da.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/upgrade.ts
@@ -34,7 +35,7 @@ function npmBeside(execPath) {
   const cli = join(binDir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
   return existsSync(cli) ? { command: execPath, args: [cli], binDir } : { command: "npm", args: [] };
 }
-var serviceInstalled = () => Promise.resolve().then(() => serviceManager().state()).then((state) => state.installed, () => false);
+var serviceState = () => Promise.resolve().then(() => serviceManager().state()).catch(() => ({ installed: false, stopped: false }));
 async function main(argv, deps = {}) {
   const { values } = parseArgs({
     args: [...argv],
@@ -75,11 +76,17 @@ async function main(argv, deps = {}) {
       return;
     }
   }
-  if (!await (deps.serviceInstalled ?? serviceInstalled)()) {
+  const service = await (deps.serviceState ?? serviceState)();
+  if (!service.installed) {
     console.log("service not installed; upgrade done, nothing restarted");
     process.exitCode = 0;
     return;
   }
+  if (service.stopped) {
+    console.log(`service stopped; upgrade done, it stays off until \`${commandHint("service")} start\``);
+    process.exitCode = 0;
+    return;
+  }
   (deps.exit ?? process.exit)(await restart({ force: values.force, argv: argv.filter((arg) => arg !== "--force") }));
 }
 if (false) {}