neko-harness 0.4.3 → 0.4.4

package/dist/client/index.html

@@ -9,8 +9,8 @@
 			href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Crect width='100' height='100' rx='26' fill='%23ffb7c5'/%3E%3Ctext x='50' y='70' font-size='58' text-anchor='middle' fill='%23ffffff' font-family='sans-serif' font-weight='bold'%3En%3C/text%3E%3C/svg%3E"
 		/>
 		<title>neko harness</title>
-		<script type="module" crossorigin src="/assets/index-DLyLR2Bn.js"></script>
-		<link rel="stylesheet" crossorigin href="/assets/index-CAwqBiZ6.css">
+		<script type="module" crossorigin src="/assets/index-BqLuRtzq.js"></script>
+		<link rel="stylesheet" crossorigin href="/assets/index-BjLs6qQU.css">
 	</head>
 	<body>
 		<div id="root"></div>

package/dist/gateway.js

@@ -17256,6 +17256,50 @@ function savedDefaultImagePrompt(content, value) {
 import { defineEntry } from "@earendil-works/pi-durable";
 var NekoInput = defineEntry("app.neko.input");
 
+// packages/core/src/queued.ts
+var QUEUED_PREVIEW_CHARS = 300;
+var textOf = (content) => {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.flatMap((b) => b && b.type === "text" && typeof b.text === "string" ? [b.text] : []).join("");
+};
+var clip = (text) => {
+  const chars = [...text.replace(/\s+/g, " ").trim()];
+  return chars.length > QUEUED_PREVIEW_CHARS ? `${chars.slice(0, QUEUED_PREVIEW_CHARS - 1).join("")}\u2026` : chars.join("");
+};
+function queuedUserInput(raw) {
+  const item = raw;
+  if (item.mode !== "steer" && item.mode !== "followUp")
+    return;
+  if (item.entry?.kind !== NekoInput.kind)
+    return;
+  const data = item.entry.data;
+  if (!data || data.jobReport || data.subagentRoundId)
+    return;
+  const defaultPrompt = Array.isArray(item.content) ? savedDefaultImagePrompt(item.content, data.defaultImagePrompt) : undefined;
+  const content = defaultPrompt && Array.isArray(item.content) ? item.content.slice(1) : item.content;
+  const skill = data.skill ? { name: data.skill.name, args: data.skill.args } : undefined;
+  return {
+    id: item.id,
+    mode: item.mode,
+    text: skill ? `/skill:${skill.name}${skill.args ? ` ${skill.args}` : ""}` : textOf(content),
+    images: data.images?.length ?? 0,
+    ...skill ? { skill } : {}
+  };
+}
+function projectQueued(view) {
+  const items = view.docs["pi.inbox"]?.items ?? [];
+  return items.flatMap((raw) => {
+    const input = queuedUserInput(raw);
+    if (!input)
+      return [];
+    const { text, ...rest } = input;
+    return [{ ...rest, preview: clip(text) }];
+  });
+}
+
 // packages/core/src/workspace.ts
 import { accessSync, constants, realpathSync, statSync } from "fs";
 import { isAbsolute, resolve as resolve2 } from "path";
@@ -17576,6 +17620,7 @@ function projectChatView(view, modelLabel, options = {}) {
     },
     cwd: savedWorkspace(agent?.cwd),
     busy: live.run !== undefined,
+    queued: projectQueued(view),
     status,
     usage: {
       input: usage.input,
@@ -17721,6 +17766,7 @@ import {
   createRegistry,
   defineDoc as defineDoc5,
   Harness,
+  InboxDoc as InboxDoc2,
   LiveDoc as importLiveDoc,
   MemoryStorage,
   UsageDoc as UsageDoc2,
@@ -19415,6 +19461,14 @@ var createResourceSnapshots = (load, submission) => {
     discard(id, requestId) {
       conversations.get(id)?.pending.delete(requestId);
     },
+    move(id, from, to) {
+      const pending = conversations.get(id)?.pending;
+      const snapshot = pending?.get(from);
+      if (!pending || !snapshot)
+        return;
+      pending.delete(from);
+      pending.set(to, snapshot);
+    },
     forget(id) {
       conversations.delete(id);
     }
@@ -21065,6 +21119,57 @@ async function createNekoRuntime(options = {}) {
     },
     abort() {
       return target.abort(context);
+    },
+    async withdraw(submissionId) {
+      const id = submissionId;
+      const inbox = await harness.snapshot(InboxDoc2, target.id, context);
+      const item = inbox?.items.find((i) => i.id === id);
+      const input = item ? queuedUserInput(item) : undefined;
+      if (item && !input)
+        return { result: "unknown" };
+      const requestId = (await (await harness.submission(id, context))?.status(context))?.requestId;
+      const outcome = await harness.abortSubmission(id, context, target.id);
+      if (outcome !== "aborted") {
+        return { result: outcome === "already_placed" ? "placed" : outcome === "settled" ? "settled" : "unknown" };
+      }
+      if (requestId !== undefined)
+        resourceSnapshots.discard(target.id, requestId);
+      await metadata.reconcile(target.id);
+      return { result: "withdrawn", ...input ? { text: input.text, images: input.images } : {} };
+    },
+    async steer(submissionId) {
+      const id = submissionId;
+      const inbox = await harness.snapshot(InboxDoc2, target.id, context);
+      const item = inbox?.items.find((i) => i.id === id);
+      const input = item ? queuedUserInput(item) : undefined;
+      if (item && (!input || item.mode === "write"))
+        return { result: "unknown" };
+      if (item && input?.mode === "steer")
+        return { result: "steered", id: submissionId };
+      const requestId = (await (await harness.submission(id, context))?.status(context))?.requestId;
+      const outcome = await harness.abortSubmission(id, context, target.id);
+      if (outcome !== "aborted" || !item || !input) {
+        return { result: outcome === "already_placed" ? "placed" : outcome === "settled" ? "settled" : "unknown" };
+      }
+      const steerRequestId = requestId !== undefined ? `steer:${requestId}` : crypto.randomUUID();
+      try {
+        const next = await target.submit({
+          type: "input",
+          content: item.content,
+          ...item.entry ? { entry: item.entry } : {},
+          requestId: steerRequestId,
+          whenBusy: "steer"
+        }, context);
+        if (requestId !== undefined)
+          resourceSnapshots.move(target.id, requestId, steerRequestId);
+        await metadata.reconcile(target.id);
+        return { result: "steered", id: next.id };
+      } catch {
+        if (requestId !== undefined)
+          resourceSnapshots.discard(target.id, requestId);
+        await metadata.reconcile(target.id);
+        return { result: "withdrawn", text: input.text, images: input.images };
+      }
     }
   });
   const rootSession = makeSession(conversation);
@@ -21477,10 +21582,29 @@ var JobOutputSchema = Type5.Object({
   truncated: bool,
   dropped: integer
 });
+var QueuedInputSchema = Type5.Object({
+  id: integer,
+  mode: Type5.Enum(["steer", "followUp"]),
+  preview: str,
+  images: integer,
+  skill: Type5.Optional(Type5.Object({ name: str, args: str }))
+});
+var WithdrawResultSchema = Type5.Object({
+  result: Type5.Enum(["withdrawn", "placed", "settled", "unknown"]),
+  text: Type5.Optional(str),
+  images: Type5.Optional(integer)
+});
+var SteerResultSchema = Type5.Object({
+  result: Type5.Enum(["steered", "withdrawn", "placed", "settled", "unknown"]),
+  id: Type5.Optional(integer),
+  text: Type5.Optional(str),
+  images: Type5.Optional(integer)
+});
 var ChatViewSchema = Type5.Object({
   historyBefore: Type5.Optional(Type5.Union([integer, nil])),
   agents: Type5.Optional(Type5.Array(SubagentSummarySchema)),
   jobs: Type5.Optional(Type5.Array(JobSummarySchema)),
+  queued: Type5.Optional(Type5.Array(QueuedInputSchema)),
   rounds: Type5.Optional(Type5.Array(DelegationSchema)),
   subagents: Type5.Optional(Type5.Array(DelegationSchema)),
   taskUsage: Type5.Optional(usage),
@@ -21685,6 +21809,8 @@ var NekoChat = contract("neko.chat", {
           whenBusy: Type5.Optional(Type5.Enum(["steer", "followUp"]))
         }, { additionalProperties: false }), nil),
         abort: rpc(nil, nil),
+        withdraw: rpc(Type5.Object({ id: integer }, { additionalProperties: false }), WithdrawResultSchema),
+        steer: rpc(Type5.Object({ id: integer }, { additionalProperties: false }), SteerResultSchema),
         usage: rpc(nil, usage),
         skills: rpc(nil, Type5.Array(Type5.Object({ name: str, description: str, location: str, level }))),
         jobOutput: rpc(Type5.Object({ jobId: str, since: Type5.Optional(integer) }, { additionalProperties: false }), JobOutputSchema),
@@ -22586,7 +22712,7 @@ function subagentClient(connect) {
 import { createHash as createHash2 } from "crypto";
 
 // packages/core/src/application-version.ts
-var RUNNING_VERSION = "0.4.3";
+var RUNNING_VERSION = "0.4.4";
 var APPLICATION_PROTOCOL = 6;
 function stableVersion(value) {
   return typeof value === "string" && /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/.test(value) && value.split(".").every((n) => Number.isSafeInteger(Number(n)));
@@ -22765,8 +22891,15 @@ var MobileAgentSchema = Type7.Object({
   roundCount: int,
   approvalCount: int
 });
+var MobileQueuedSchema = Type7.Object({
+  id: int,
+  mode: Type7.Union([Type7.Literal("steer"), Type7.Literal("followUp")]),
+  preview: Type7.String(),
+  images: int
+});
 var MobileChatStatusSchema = Type7.Object({
   busy: Type7.Boolean(),
+  queued: opt(Type7.Array(MobileQueuedSchema)),
   status: nullable2(str2),
   usage: MobileUsageSchema,
   taskUsage: opt(MobileUsageSchema),
@@ -22850,6 +22983,34 @@ var MOBILE_API_V1_METHODS = {
     params: Type7.Object({ ...subscription, requestId: Type7.String({ minLength: 1, maxLength: 128 }) }),
     result: Type7.Object({ status: Type7.Union([Type7.Literal("accepted"), Type7.Literal("unknown")]) })
   },
+  "chat.steer": {
+    params: Type7.Object({ ...subscription, id: int }),
+    result: Type7.Object({
+      result: Type7.Union([
+        Type7.Literal("steered"),
+        Type7.Literal("withdrawn"),
+        Type7.Literal("placed"),
+        Type7.Literal("settled"),
+        Type7.Literal("unknown")
+      ]),
+      id: opt(int),
+      text: opt(Type7.String()),
+      images: opt(int)
+    })
+  },
+  "chat.withdraw": {
+    params: Type7.Object({ ...subscription, id: int }),
+    result: Type7.Object({
+      result: Type7.Union([
+        Type7.Literal("withdrawn"),
+        Type7.Literal("placed"),
+        Type7.Literal("settled"),
+        Type7.Literal("unknown")
+      ]),
+      text: opt(Type7.String()),
+      images: opt(int)
+    })
+  },
   "chat.abort": { params: Type7.Object(subscription), result: Type7.Object({ accepted: Type7.Boolean() }) },
   "subagents.open": {
     params: Type7.Object({ ...subscription, agentId: opt(Type7.String({ minLength: 1 })), taskId: opt(int) }),
@@ -23137,6 +23298,9 @@ function mapStatus(view, options = {}) {
   const latest = view.compaction?.latest;
   return {
     busy: view.busy,
+    ...view.queued === undefined ? {} : {
+      queued: view.queued.map(({ id, mode, preview, images }) => ({ id, mode, preview, images }))
+    },
     status: view.status,
     usage: mapUsage(view.usage),
     ...view.taskUsage === undefined ? {} : { taskUsage: mapUsage(view.taskUsage) },
@@ -23623,6 +23787,10 @@ class MobileAdapter {
         return this.chatSubmit(params);
       case "chat.submissionStatus":
         return this.chatSubmissionStatus(params);
+      case "chat.steer":
+        return this.chatSteer(params);
+      case "chat.withdraw":
+        return this.chatWithdraw(params);
       case "chat.abort":
         return this.chatAbort(params);
       case "subagents.open":
@@ -23852,6 +24020,16 @@ class MobileAdapter {
     const accepted = await this.runtime.submissionAccepted(state.sessionId, params.requestId);
     return { status: accepted ? "accepted" : "unknown" };
   }
+  async chatSteer(params) {
+    const state = this.requireChat(params);
+    this.assertAuthorized();
+    return remote2(() => state.chat.steer({ id: params.id }), "rejected");
+  }
+  async chatWithdraw(params) {
+    const state = this.requireChat(params);
+    this.assertAuthorized();
+    return remote2(() => state.chat.withdraw({ id: params.id }), "rejected");
+  }
   async chatAbort(params) {
     const state = this.requireChat(params);
     this.assertAuthorized();
@@ -26109,6 +26287,7 @@ var emptyView = {
   agent: { model: null, thinkingLevel: null },
   cwd: "",
   busy: false,
+  queued: [],
   status: null,
   usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 },
   items: [],
@@ -26376,6 +26555,8 @@ function serveSessions(host, runtime, context) {
         await projection.value.session.abort();
         return null;
       },
+      withdraw: ({ id }) => projection.value.session.withdraw(id),
+      steer: ({ id }) => projection.value.session.steer(id),
       skills: () => runtime.listSkills(projection.value.session.id),
       jobOutput: async ({ jobId, since }) => {
         try {