@awak-app/simy-cli 0.7.44 → 0.7.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.7.44",
+  "version": "0.7.45",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {

package/src/cli-contract.js

@@ -14,7 +14,7 @@ import {
 } from "./durable-local-task-steps-contract.js";
 import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export const CLI_VERSION = "0.7.44";
+export const CLI_VERSION = "0.7.45";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function narrativeImageCapabilityMetadata() {

package/src/delivery-hooks/supervisor.js

@@ -160,7 +160,7 @@ export async function executeCodexResume(record, { signal, root, leaseId, execut
   });
 }
 
-export async function tickManagedTasks({ root, webOrigin, now = Date.now(), execute, inspectProcess = processIdentity, signal, beforeClaim, authorizeDispatch, readRecords, observeTurn, observeAuthentication, inspectProvider = inspectCodexAppServer, shouldYield, nativeHandoff = reconcileNativeHandoff } = {}) {
+export async function tickManagedTasks({ root, webOrigin, now = Date.now(), execute, inspectProcess = processIdentity, signal, beforeClaim, authorizeDispatch, readRecords, readCancellationRecords, observeTurn, observeAuthentication, inspectProvider = inspectCodexAppServer, shouldYield, nativeHandoff = reconcileNativeHandoff } = {}) {
   const tickWallStart = Date.now();
   const currentTime = () => now + Math.max(0, Date.now() - tickWallStart);
   if (signal?.aborted) return;
@@ -170,7 +170,11 @@ export async function tickManagedTasks({ root, webOrigin, now = Date.now(), exec
   // OFF changes the consent epoch and removes a task from a scoped activation.
   // Still reconcile its old native queue on reconnect, without admitting work
   // outside this supervisor's selected scope.
-  const cancellationOnly = readRecords ? (await listRecords(root)).filter(r => r.run?.managed?.nativeHandoff && !selectedIds.has(identity(r))) : [];
+  // Desktop callers can share their fresh metadata-validated global index.
+  // Keep it separate from the selected scope: a revoked native queue must still
+  // be cancelled, and the handoff reconciler re-reads authority before acting.
+  const cancellationOnly = readRecords ? (await (readCancellationRecords ? readCancellationRecords() : listRecords(root)))
+    .filter(r => r.run?.managed?.nativeHandoff && !selectedIds.has(identity(r))) : [];
   for (const record of [...selected, ...cancellationOnly]) {
     if (signal?.aborted || await shouldYield?.()) return;
     if ((!execute || record.run?.managed?.nativeHandoff) && await nativeHandoff({ root, record, signal, authorize: authorizeDispatch, cancelOnly: !selectedIds.has(identity(record)) })) nativeOwned.add(identity(record));

package/src/desktop-catalog-frames.js

@@ -41,6 +41,38 @@ function updateRows(previous, incoming, full, { unchanged = false, immutableInpu
   return { rows: immutableInput ? incoming : rows, payload: { count: incoming.length, changes } };
 }
 
+// A display ordering change is not a row-content change. Version 2 references
+// positions in the last delivered base; ambiguous identities are sent in full.
+const rowIdentity = row => row && typeof row.session === 'string' && row.session
+  ? JSON.stringify([row.hostId ?? 'local', row.provider ?? null, row.session]) : null;
+function updateOrderedRows(previous, incoming, full, { unchanged = false, immutableInput = false } = {}) {
+  if (full || previous === null) return updateRows(previous, incoming, true, { immutableInput });
+  if (unchanged) return { rows: previous, payload: { count: previous.length, changes: [] } };
+  const positions = new Map(), incomingCounts = new Map();
+  for (let index = 0; index < previous.length; index++) {
+    const key = rowIdentity(previous[index]);
+    if (key !== null) positions.set(key, positions.has(key) ? -1 : index);
+  }
+  for (const row of incoming) { const key = rowIdentity(row); if (key !== null) incomingCounts.set(key, (incomingCounts.get(key) || 0) + 1); }
+  const order = [], changes = [], rows = [], reused = new Set();
+  let reordered = previous.length !== incoming.length;
+  for (let index = 0; index < incoming.length; index++) {
+    const row = incoming[index], key = rowIdentity(row), source = positions.get(key);
+    const unique = key !== null && incomingCounts.get(key) === 1 && source >= 0;
+    const reuse = unique && !reused.has(source) && isDeepStrictEqual(previous[source], row) ? source
+      : !unique && index < previous.length && !reused.has(index) && isDeepStrictEqual(previous[index], row) ? index : null;
+    if (reuse !== null) {
+      rows.push(previous[reuse]); order.push(reuse); reused.add(reuse);
+      if (reuse !== index) reordered = true;
+    } else {
+      const detached = immutableInput ? row : structuredClone(row);
+      rows.push(detached); order.push(null); changes.push([index, detached]);
+    }
+  }
+  return { rows: immutableInput ? incoming : !reordered && changes.length === 0 ? previous : rows,
+    payload: { count: incoming.length, changes, ...(reordered ? { order } : {}) } };
+}
+
 // Detach mutable producer data once. Unchanged catalog rows may be shared only
 // between these owned read-only snapshots; changed rows get detached copies and
 // a new array. Older queued frames and durable writes must remain immutable.
@@ -69,7 +101,9 @@ export function createDesktopStatusSnapshot() {
 // One encoder per ordered output stream. Call only when a frame actually enters
 // that stream, after replaceable/backpressured snapshots have been coalesced.
 // This cache is transport state; it never authorizes work or provider dispatch.
-export function createDesktopCatalogEncoder({ immutableInput = false } = {}) {
+export function createDesktopCatalogEncoder({ immutableInput = false, version = 1 } = {}) {
+  if (![1, 2].includes(version)) throw new Error('Unsupported desktop catalog version.');
+  const projectRows = version === 2 ? updateOrderedRows : updateRows;
   let rows = null, candidates = null, sourceRows = null, sourceCandidates = null, scope = null, revision = 0;
   const reset = () => { rows = null; candidates = null; sourceRows = null; sourceCandidates = null; scope = null; };
   return { reset, encode(frame) {
@@ -81,16 +115,16 @@ export function createDesktopCatalogEncoder({ immutableInput = false } = {}) {
     const incoming = status.sessionSupervision.sessions;
     const identity = catalogScope(status);
     const previous = revision++;
-    const full = rows === null || scope !== identity || rows.length !== incoming.length;
-    const snapshot = updateRows(rows, incoming, full, { immutableInput, unchanged: immutableInput && sourceRows === incoming });
+    const full = rows === null || scope !== identity || version === 1 && rows.length !== incoming.length;
+    const snapshot = projectRows(rows, incoming, full, { immutableInput, unchanged: immutableInput && sourceRows === incoming });
     rows = snapshot.rows; sourceRows = incoming; scope = identity;
-    const catalog = { version: 1, revision, scope, ...(full ? {} : { baseRevision: previous }), ...snapshot.payload };
+    const catalog = { version, revision, scope, ...(full ? {} : { baseRevision: previous }), ...snapshot.payload };
     const { sessions, ...metadata } = status.sessionSupervision;
     let supervision = metadata;
     if (Array.isArray(metadata.selectionCandidates)) {
       // This is another complete directory, used by the conversation picker.
       // Do not silently retransmit it as supposedly small status metadata.
-      const snapshot = updateRows(candidates, metadata.selectionCandidates, full,
+      const snapshot = projectRows(candidates, metadata.selectionCandidates, full,
         { immutableInput, unchanged: immutableInput && sourceCandidates === metadata.selectionCandidates });
       candidates = snapshot.rows; sourceCandidates = metadata.selectionCandidates; catalog.selectionCandidates = snapshot.payload;
       const { selectionCandidates, ...small } = metadata;

package/src/desktop-host.js

@@ -160,8 +160,8 @@ export { createDesktopFrameWriter } from './desktop-frame-writer.js';
 
 export async function startDesktopHost({ input = process.stdin, output = process.stdout, env = process.env,
   updatePackageRoot, dependencies = {}, exit = (code) => process.exit(code) } = {}) {
-  let catalogEncoder = env.SIMY_REMOTE_CHILD !== '1' && env.SIMY_DESKTOP_CATALOG_DELTA === '1'
-    ? createDesktopCatalogEncoder({ immutableInput: true }) : null;
+  let catalogEncoder = env.SIMY_REMOTE_CHILD !== '1' && ['1', '2'].includes(env.SIMY_DESKTOP_CATALOG_DELTA)
+    ? createDesktopCatalogEncoder({ immutableInput: true, version: env.SIMY_DESKTOP_CATALOG_VERSION === '2' ? 2 : Number(env.SIMY_DESKTOP_CATALOG_DELTA) }) : null;
   // Object frames below own detached snapshots. Queue their references rather
   // than copying multi-MiB history again whenever a native reader is paused.
   const frames = createDesktopFrameWriter(output, { capture: frame => frame,
@@ -605,6 +605,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
       const link = await requireProviderLink({ root: deliveryRoot, provider: record.provider });
       return JSON.stringify([scope, link.epoch]);
     }, readRecords: () => recordReader.list(),
+    readCancellationRecords: () => recordReader.list(),
     readCurrentRecord: (provider, session) => readRecord(deliveryRoot, provider, session),
     beforeClaim: record => actionAssociations.prepareCached?.(record) || record });
   let shuttingDown = null;
@@ -2563,7 +2564,8 @@ if (isDesktopHostEntry()) {
   try {
     const root = process.env.SIMY_HOME?.trim() || join(homedir(), '.simy');
     if (process.env.SIMY_DESKTOP_ATTACH_OWNER === '1' && await relayToOwner({ root, webOrigin: resolveWebOrigin(null, process.env), desktopClient: true,
-      catalogDeltas: process.env.SIMY_DESKTOP_CATALOG_DELTA === '1' })) process.exit(0);
+      catalogDeltas: ['1', '2'].includes(process.env.SIMY_DESKTOP_CATALOG_DELTA)
+        ? process.env.SIMY_DESKTOP_CATALOG_VERSION === '2' ? 2 : Number(process.env.SIMY_DESKTOP_CATALOG_DELTA) : false })) process.exit(0);
     try { await adoptInstalledRuntime({ root }); }
     catch (error) {
       if (error.code === PROCESS_CONFLICT_CODE) throw error;

package/src/session-supervision/owner-transport.js

@@ -45,7 +45,8 @@ export async function createOwnerTransport({ root, nonce, allowedActions, dispat
         if (!authenticated) {
           if (command.nonce !== nonce) { peer.destroy(); return; }
           authenticated = true; desktopClient = allowDesktopClient && command.client === 'desktop'; controllerArchive = allowControllerArchive && command.client === 'archive-controller'; clearTimeout(timeout); peers.add(peer);
-          if (desktopClient && (command.desktopProtocol === 2 || command.catalogDeltas === 1)) catalogEncoders.set(peer, createDesktopCatalogEncoder());
+          if (desktopClient && (command.desktopProtocol === 2 || command.catalogDeltas === 1))
+            catalogEncoders.set(peer, createDesktopCatalogEncoder({ version: command.catalogVersion === 2 ? 2 : 1 }));
           if ([1, 2].includes(command.desktopProtocol) && desktopClient) send(peer, { type: 'desktop_owner_ready', version: catalogEncoders.has(peer) ? 2 : 1 });
           // One-shot controls need their result, not multi-megabyte broadcasts
           // that can fill the write queue before the result is sent.
@@ -119,7 +120,8 @@ export async function relayToOwner({ root, webOrigin, input = process.stdin, out
   } catch (error) { peer.destroy(); throw error; }
   // A protocol-1 owner replies with complete frames. New native windows accept
   // both versions, so attaching never requires replacing its execution owner.
-  peer.write(JSON.stringify({ nonce: owner.nonce, ...(desktopClient ? { client: 'desktop', desktopProtocol: 1, ...(catalogDeltas ? { catalogDeltas: 1 } : {}) } : {}) }) + '\n');
+  peer.write(JSON.stringify({ nonce: owner.nonce, ...(desktopClient ? { client: 'desktop', desktopProtocol: 1,
+    ...(catalogDeltas ? { catalogDeltas: 1, ...(catalogDeltas === 2 ? { catalogVersion: 2 } : {}) } : {}) } : {}) }) + '\n');
   // Old owners ignore unknown hello fields and expose only the restricted SSH
   // projection. Never attach a native window or forward its controls as though
   // that were a complete desktop endpoint. Keep the original owner untouched.