pinomad 0.6.0 → 0.7.0

package/dist/{chunk-ggb1taqy.js → chunk-1t58fh0k.js}

@@ -2,11 +2,11 @@
 import {
   main,
   restartService
-} from "./chunk-d5ypmmr7.js";
+} from "./chunk-12kaxggg.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-c8nxym2z.js";
-import"./chunk-d93kvxvc.js";
-import"./chunk-n4tjhcb7.js";
+import"./chunk-rtwxjb90.js";
+import"./chunk-sj7rnvh4.js";
+import"./chunk-e4ahjbmz.js";
 import"./chunk-znhn8af7.js";
 import"./chunk-ngf1zatm.js";
 import"./chunk-df32avw6.js";

package/dist/{chunk-wqvp1fwh.js → chunk-6ysezfy5.js}

@@ -13,7 +13,7 @@ import {
 import {
   commandHint,
   webRoot
-} from "./chunk-c8nxym2z.js";
+} from "./chunk-rtwxjb90.js";
 import {
   normalizeHostName
 } from "./chunk-znhn8af7.js";
@@ -402,7 +402,7 @@ async function changePassword(options) {
 
 // apps/server/src/apns.ts
 import { createPrivateKey, sign } from "node:crypto";
-import { connect } from "node:http2";
+import { connect, constants } from "node:http2";
 var AUTHORITIES = {
   production: "https://api.push.apple.com",
   development: "https://api.sandbox.push.apple.com"
@@ -471,19 +471,25 @@ function openApns(config) {
     state.token = { jwt, issuedAt: now };
     return jwt;
   };
+  const dropSession = (state, session) => {
+    if (state.session === session)
+      state.session = undefined;
+    if (!session.destroyed)
+      session.destroy();
+  };
+  const retireSession = (state, session) => {
+    if (state.session === session)
+      state.session = undefined;
+    if (!session.closed && !session.destroyed)
+      session.close();
+  };
   const sessionFor = (environment, state) => {
     const existing = state.session;
     if (existing !== undefined && !existing.destroyed && !existing.closed)
       return existing;
     const session = connect(state.authority);
-    const drop = () => {
-      if (state.session === session)
-        state.session = undefined;
-      if (!session.destroyed)
-        session.destroy();
-    };
-    session.once("goaway", drop);
-    session.once("error", drop);
+    session.once("goaway", () => dropSession(state, session));
+    session.once("error", () => dropSession(state, session));
     session.once("close", () => {
       if (state.session === session)
         state.session = undefined;
@@ -566,6 +572,7 @@ function openApns(config) {
           resolve({ result: "retry", reason: "session unavailable" });
           return;
         }
+        let responded = false;
         let status = 0;
         let responseHeaders = {};
         const chunks = [];
@@ -580,11 +587,16 @@ function openApns(config) {
         };
         const timer = setTimeout(() => finish({ result: "retry", reason: "apns timeout" }), REQUEST_TIMEOUT_MS);
         stream.on("response", (headers) => {
+          responded = true;
           status = Number(headers[":status"] ?? 0);
           responseHeaders = headers;
         });
         stream.on("data", (chunk) => chunks.push(chunk));
         stream.on("end", () => {
+          if (!responded) {
+            finish({ result: "retry", reason: "connection closed" });
+            return;
+          }
           let body2;
           try {
             body2 = JSON.parse(Buffer.concat(chunks).toString("utf8"));
@@ -593,7 +605,12 @@ function openApns(config) {
           }
           finish(classify(request.environment, status, responseHeaders, body2, state));
         });
-        stream.on("error", () => finish({ result: "retry", reason: "connection error" }));
+        stream.on("error", () => {
+          const refused = stream.rstCode === constants.NGHTTP2_REFUSED_STREAM;
+          finish({ result: "retry", reason: "connection error" });
+          if (refused)
+            retireSession(state, session);
+        });
         stream.on("aborted", () => finish({ result: "retry", reason: "connection aborted" }));
         stream.end(body);
       });

package/dist/{chunk-367n9je8.js → chunk-8yme2wep.js}

@@ -1,6 +1,6 @@
 import {
   packagedVersion
-} from "./chunk-c8nxym2z.js";
+} from "./chunk-rtwxjb90.js";
 import {
   hostAddress
 } from "./chunk-ngf1zatm.js";

package/dist/{chunk-n4tjhcb7.js → chunk-e4ahjbmz.js}

@@ -14,20 +14,43 @@ 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: 12 };
+var PROTOCOL = { major: 5, minor: 19 };
 var CALL_SINCE = {
-  logout: 1,
-  updateSettings: 2,
+  addProject: 0,
+  removeProject: 0,
   listFolders: 3,
+  listFiles: 10,
+  listSkills: 13,
+  listCommands: 17,
+  createConversation: 0,
+  archive: 0,
   renameConversation: 4,
+  submit: 0,
+  withdrawQueued: 14,
+  steerQueued: 14,
+  abort: 0,
+  compact: 0,
+  runCommand: 17,
+  setModel: 0,
+  setThinkingLevel: 0,
+  setAgent: 18,
+  fork: 0,
+  answer: 0,
+  changes: 0,
+  createPairing: 0,
+  revokeDevice: 0,
+  logout: 1,
+  updateSettings: 2,
   createAgent: 6,
   updateAgent: 6,
   deleteAgent: 6,
   setPushToken: 7,
-  listFiles: 10
+  image: 15,
+  beginAttachment: 19,
+  appendAttachment: 19
 };
 function hostSupportsCall(hostMinor, method) {
-  return hostMinor >= (CALL_SINCE[method] ?? 0);
+  return hostMinor >= CALL_SINCE[method];
 }
 var FEATURE_SINCE = {
   images: 5,
@@ -35,7 +58,10 @@ var FEATURE_SINCE = {
   apnsPush: 9,
   agentConversations: 10,
   liveBranch: 11,
-  hostName: 12
+  hostName: 12,
+  imageRefs: 15,
+  boundSkills: 16,
+  attachments: 19
 };
 function hostSupportsFeature(hostMinor, feature) {
   return hostMinor >= FEATURE_SINCE[feature];
@@ -48,7 +74,8 @@ function parseClientFrame(value) {
     if (typeof stream !== "string")
       return { kind: "malformed" };
     if (isStreamName(stream)) {
-      return { kind: "frame", frame: { type: value.type, stream } };
+      const refs = value.type === "subscribe" && value.images === "ref";
+      return { kind: "frame", frame: refs ? { type: "subscribe", stream, images: "ref" } : { type: value.type, stream } };
     }
     const prefix = stream.slice(0, stream.indexOf(":") === -1 ? undefined : stream.indexOf(":"));
     if (STREAM_KINDS.has(prefix))
@@ -70,31 +97,7 @@ function isStreamName(stream) {
   return stream === "tasks" || HOST_STREAM_NAMES.includes(stream) || /^(?:conversation:|doc:.+:)[1-9]\d*$/.test(stream);
 }
 var isCallMethod = (method) => CALL_METHODS.includes(method);
-var CALL_METHODS = [
-  "addProject",
-  "removeProject",
-  "listFolders",
-  "createConversation",
-  "archive",
-  "renameConversation",
-  "submit",
-  "abort",
-  "compact",
-  "setModel",
-  "setThinkingLevel",
-  "fork",
-  "answer",
-  "changes",
-  "createPairing",
-  "revokeDevice",
-  "logout",
-  "updateSettings",
-  "createAgent",
-  "updateAgent",
-  "deleteAgent",
-  "setPushToken",
-  "listFiles"
-];
+var CALL_METHODS = Object.keys(CALL_SINCE);
 var SETTING_VALIDATORS = {
   defaultModel: (value) => value === null || record(value) && nonempty(value.provider) && nonempty(value.modelId),
   defaultThinkingLevel: (value) => value === null || isThinkingLevel(value),
@@ -105,17 +108,29 @@ var SETTING_VALIDATORS = {
 };
 function validCallArgs(method, args) {
   const conversationId = () => typeof args.conversationId === "number" && Number.isSafeInteger(args.conversationId) && args.conversationId >= 1;
-  const images = () => args.images === undefined || Array.isArray(args.images) && args.images.every((image) => record(image) && typeof image.data === "string" && typeof image.mimeType === "string");
+  const submissionId = () => typeof args.submissionId === "number" && Number.isSafeInteger(args.submissionId) && args.submissionId >= 1;
+  const images = () => args.images === undefined || Array.isArray(args.images) && args.images.every((image) => record(image) && ("data" in image ? typeof image.data === "string" && typeof image.mimeType === "string" : nonempty(image.ref)));
+  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");
   switch (method) {
     case "submit":
-      return conversationId() && typeof args.text === "string" && (args.whenBusy === "steer" || args.whenBusy === "followUp") && nonempty(args.requestId) && images();
+      return conversationId() && typeof args.text === "string" && (args.whenBusy === "steer" || args.whenBusy === "followUp") && nonempty(args.requestId) && images() && skills() && attachments();
+    case "withdrawQueued":
+    case "steerQueued":
+      return conversationId() && submissionId();
     case "abort":
       return conversationId();
     case "setThinkingLevel":
       return conversationId() && nonempty(args.level);
+    case "setAgent":
+      return conversationId() && (args.agent === null || nonempty(args.agent));
     case "compact":
       return conversationId() && (args.instructions === undefined || typeof args.instructions === "string");
+    case "listCommands":
+      return conversationId();
+    case "runCommand":
+      return conversationId() && nonempty(args.name) && (args.args === undefined || typeof args.args === "string");
     case "setModel":
       return conversationId() && record(args.model) && nonempty(args.model.provider) && nonempty(args.model.modelId);
     case "fork":
@@ -124,15 +139,23 @@ 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 "image":
+      return nonempty(args.ref);
+    case "beginAttachment":
+      return nonempty(args.name) && typeof args.size === "number" && Number.isSafeInteger(args.size) && args.size >= 0;
+    case "appendAttachment":
+      return nonempty(args.attachmentId) && typeof args.offset === "number" && Number.isSafeInteger(args.offset) && args.offset >= 0 && typeof args.data === "string";
     case "addProject":
     case "removeProject":
       return nonempty(args.path);
     case "listFolders":
       return args.path === undefined || nonempty(args.path);
     case "createConversation":
-      return record(args.home) && (args.home.kind === "chat" || args.home.kind === "project" && nonempty(args.home.path)) && typeof args.text === "string" && (nonempty(args.text) || Array.isArray(args.images) && args.images.length > 0) && nonempty(args.requestId) && images() && (args.checkout === undefined || args.checkout === "worktree" || args.checkout === "project") && (args.model === undefined || record(args.model) && nonempty(args.model.provider) && nonempty(args.model.modelId)) && (args.thinkingLevel === undefined || nonempty(args.thinkingLevel)) && (args.agent === undefined || nonempty(args.agent));
+      return record(args.home) && (args.home.kind === "chat" || args.home.kind === "project" && nonempty(args.home.path)) && typeof args.text === "string" && (nonempty(args.text) || Array.isArray(args.images) && args.images.length > 0 || Array.isArray(args.attachments) && args.attachments.length > 0) && nonempty(args.requestId) && images() && skills() && attachments() && (args.checkout === undefined || args.checkout === "worktree" || args.checkout === "project") && (args.model === undefined || record(args.model) && nonempty(args.model.provider) && nonempty(args.model.modelId)) && (args.thinkingLevel === undefined || nonempty(args.thinkingLevel)) && (args.agent === undefined || nonempty(args.agent));
     case "listFiles":
       return typeof args.query === "string" && record(args.scope) && (args.scope.kind === "conversation" && typeof args.scope.conversationId === "number" && Number.isSafeInteger(args.scope.conversationId) && args.scope.conversationId >= 1 || args.scope.kind === "project" && nonempty(args.scope.path) && (args.scope.checkout === "worktree" || args.scope.checkout === "project"));
+    case "listSkills":
+      return record(args.scope) && (args.scope.kind === "conversation" && typeof args.scope.conversationId === "number" && Number.isSafeInteger(args.scope.conversationId) && args.scope.conversationId >= 1 || args.scope.kind === "project" && nonempty(args.scope.path) && (args.scope.checkout === "worktree" || args.scope.checkout === "project") || args.scope.kind === "chat");
     case "archive":
       return conversationId() && typeof args.archived === "boolean";
     case "renameConversation":
@@ -161,6 +184,145 @@ function nonempty(value) {
   return typeof value === "string" && value.length > 0;
 }
 
+// packages/protocol/src/attachments.ts
+var MAX_ATTACHMENT_BYTES = 10 * 1024 * 1024;
+var MAX_ATTACHMENTS_PER_MESSAGE = 10;
+var ATTACHMENT_CHUNK_BYTES = 512 * 1024;
+var MAX_PENDING_ATTACHMENTS = 20;
+var MAX_PENDING_ATTACHMENT_BYTES = 200 * 1024 * 1024;
+var ATTACHMENT_TTL_MS = 24 * 60 * 60 * 1000;
+var MAX_ATTACHMENT_NAME_LENGTH = 255;
+var ATTACHMENT_ID_PATTERN = /^[A-Za-z0-9_-]{22}$/;
+function isAttachmentId(value) {
+  return ATTACHMENT_ID_PATTERN.test(value);
+}
+var ATTACHMENTS_OPEN = '<attachments v="1">';
+var ATTACHMENTS_INSTRUCTION = "The user attached these files. They are read-only originals on this machine: read them with your tools when relevant, and copy one into the working directory before changing it.";
+var ATTACHMENTS_CLOSE = "</attachments>";
+var BASE64 = /^[A-Za-z0-9+/]*={0,2}$/;
+function base64DecodedLength(data) {
+  if (data.length % 4 !== 0 || !BASE64.test(data))
+    return;
+  const padding = data.endsWith("==") ? 2 : data.endsWith("=") ? 1 : 0;
+  return data.length * 3 / 4 - padding;
+}
+function attachmentBeginProblem(name, size) {
+  if (name.trim() === "")
+    return "Attachment name cannot be empty";
+  if (!Number.isSafeInteger(size) || size < 0)
+    return "Attachment size must be a non-negative integer";
+  if (size > MAX_ATTACHMENT_BYTES)
+    return `Attachment is larger than ${MAX_ATTACHMENT_BYTES / (1024 * 1024)} MB`;
+  return;
+}
+function attachmentChunkProblem(data) {
+  const size = base64DecodedLength(data);
+  if (size === undefined)
+    return "Attachment chunk is not valid base64";
+  if (size > ATTACHMENT_CHUNK_BYTES)
+    return `Attachment chunk is larger than ${ATTACHMENT_CHUNK_BYTES / 1024} KiB`;
+  return;
+}
+function xmlAttribute(value) {
+  let out = "";
+  for (let i = 0;i < value.length; i++) {
+    const unit = value.charCodeAt(i);
+    if (unit === 38)
+      out += "&amp;";
+    else if (unit === 60)
+      out += "&lt;";
+    else if (unit === 62)
+      out += "&gt;";
+    else if (unit === 34)
+      out += "&quot;";
+    else if (unit < 32 || unit === 127)
+      out += `&#x${unit.toString(16)};`;
+    else
+      out += value[i];
+  }
+  return out;
+}
+function attachmentBlock(files) {
+  const lines = [
+    ATTACHMENTS_OPEN,
+    ATTACHMENTS_INSTRUCTION,
+    ...files.map((file) => `<file id="${xmlAttribute(file.id)}" name="${xmlAttribute(file.name)}" path="${xmlAttribute(file.path)}" size="${file.size}"/>`),
+    ATTACHMENTS_CLOSE
+  ];
+  return lines.join(`
+`);
+}
+var FILE_OPEN = '<file id="';
+var FILE_NAME = '" name="';
+var FILE_PATH = '" path="';
+var FILE_SIZE = '" size="';
+var FILE_END = '"/>';
+var SIZE = /^(?:0|[1-9][0-9]*)$/;
+function decodeXmlAttribute(value) {
+  return value.replace(/&(amp|lt|gt|quot|apos|#x[0-9A-Fa-f]+|#[0-9]+);/g, (entity, body) => {
+    if (body === "amp")
+      return "&";
+    if (body === "lt")
+      return "<";
+    if (body === "gt")
+      return ">";
+    if (body === "quot")
+      return '"';
+    if (body === "apos")
+      return "'";
+    const code = body.startsWith("#x") ? parseInt(body.slice(2), 16) : parseInt(body.slice(1), 10);
+    return code >= 0 && code <= 1114111 ? String.fromCodePoint(code) : entity;
+  });
+}
+function quoted(text, at, marker) {
+  if (!text.startsWith(marker, at))
+    return;
+  const start = at + marker.length;
+  const end = text.indexOf('"', start);
+  if (end === -1)
+    return;
+  return { value: text.slice(start, end), next: end };
+}
+function parseFileLine(line) {
+  const id = quoted(line, 0, FILE_OPEN);
+  if (id === undefined)
+    return;
+  const name = quoted(line, id.next, FILE_NAME);
+  if (name === undefined)
+    return;
+  const path = quoted(line, name.next, FILE_PATH);
+  if (path === undefined)
+    return;
+  const size = quoted(line, path.next, FILE_SIZE);
+  if (size === undefined || !line.startsWith(FILE_END, size.next) || size.next + FILE_END.length !== line.length) {
+    return;
+  }
+  if (!isAttachmentId(id.value) || !SIZE.test(size.value))
+    return;
+  const bytes = Number(size.value);
+  if (!Number.isSafeInteger(bytes))
+    return;
+  return { id: id.value, name: decodeXmlAttribute(name.value), size: bytes };
+}
+function parseAttachmentBlock(text) {
+  if (!text.startsWith(ATTACHMENTS_OPEN + `
+`) || !text.endsWith(`
+` + ATTACHMENTS_CLOSE))
+    return;
+  const lines = text.slice(ATTACHMENTS_OPEN.length + 1, -(ATTACHMENTS_CLOSE.length + 1)).split(`
+`);
+  if (lines[0] !== ATTACHMENTS_INSTRUCTION || lines.length < 2)
+    return;
+  const files = [];
+  for (const line of lines.slice(1)) {
+    const file = parseFileLine(line);
+    if (file === undefined)
+      return;
+    files.push(file);
+  }
+  return files;
+}
+
 // packages/protocol/src/organization.ts
 function organize(index, summaries) {
   const summaryById = new Map(summaries.map((summary) => [summary.id, summary]));
@@ -254,4 +416,4 @@ function homeOf(index, summaries, id) {
   return;
 }
 
-export { HOST_STREAM_NAMES, hostStreams, conversationStream, docStream, UNAUTHORIZED_CLOSE_CODE, INVALID_FRAME_CLOSE_CODE, PROTOCOL, hostSupportsCall, hostSupportsFeature, parseClientFrame, organize, checkoutOf, homeOf };
+export { 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 };

package/dist/{chunk-k2s1hfq5.js → chunk-fbkd73zr.js}

@@ -22,14 +22,14 @@ import {
   restartService,
   serviceManager,
   withoutRelayArgs
-} from "./chunk-d5ypmmr7.js";
+} from "./chunk-12kaxggg.js";
 import"./chunk-kzbzacz9.js";
 import {
   commandHint,
   hostEntry
-} from "./chunk-c8nxym2z.js";
-import"./chunk-d93kvxvc.js";
-import"./chunk-n4tjhcb7.js";
+} from "./chunk-rtwxjb90.js";
+import"./chunk-sj7rnvh4.js";
+import"./chunk-e4ahjbmz.js";
 import {
   cleanHostName,
   normalizeHostName

package/dist/{chunk-7s1f4z4g.js → chunk-m4c5gvce.js}

@@ -1,7 +1,7 @@
 import {
   connectRemoteDurable
-} from "./chunk-d93kvxvc.js";
-import"./chunk-n4tjhcb7.js";
+} from "./chunk-sj7rnvh4.js";
+import"./chunk-e4ahjbmz.js";
 import"./chunk-znhn8af7.js";
 import {
   hostAddress

package/dist/{chunk-c8nxym2z.js → chunk-rtwxjb90.js}

@@ -1,6 +1,6 @@
 // apps/host/src/distribution.ts
 import { fileURLToPath } from "node:url";
-var packagedVersion = "0.6.0";
+var packagedVersion = "0.7.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}`;