@gakim-digital/dexter-bridge 0.13.7 → 0.13.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gakim-digital/dexter-bridge",
-  "version": "0.13.7",
+  "version": "0.13.8",
   "description": "Local bridge for InstaWebAI and Dexter — runs Codex, Claude Code, or OpenCode on your machine.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -1233,12 +1233,15 @@ function runProcess(
     stdoutProgress,
   } = {},
 ) {
+  // An abort without a reason carries a DOMException, whose code is read-only.
+  const cancellationError = (reason) =>
+    reason instanceof Error && !(reason instanceof DOMException)
+      ? Object.assign(reason, { code: reason.code || 'RUN_CANCELLED' })
+      : Object.assign(new Error('The model process was cancelled.'), { code: 'RUN_CANCELLED' });
   return new Promise((resolve, reject) => {
     const stopped = [signal, bridgeShutdown.signal].find((candidate) => candidate?.aborted);
     if (stopped) {
-      const error = stopped.reason instanceof Error ? stopped.reason : new Error('The model process was cancelled.');
-      error.code = error.code || 'RUN_CANCELLED';
-      reject(error);
+      reject(cancellationError(stopped.reason));
       return;
     }
     const started = Date.now();
@@ -1327,9 +1330,7 @@ function runProcess(
     const abort = (event) => {
       if (settled || terminationError) return;
       clearTimers();
-      const reason = event?.target?.reason;
-      const error = reason instanceof Error ? reason : new Error('The model process was cancelled.');
-      error.code = error.code || 'RUN_CANCELLED';
+      const error = cancellationError(event?.target?.reason);
       terminationError = error;
       terminateChildTree(error);
       trace?.info('agent_process_cancelled', {
@@ -2520,6 +2521,8 @@ async function executeOutcomeRun(run, send, agent, options = {}) {
     rejectCancellation(cancellationError());
     return cancelAction;
   };
+  // Framer programs can run for minutes; Stop does not wait for them.
+  const unlessCancelled = (work) => Promise.race([work, cancellation]);
   const postActivity = (payload) => {
     activityChain = activityChain
       .then(async () => {
@@ -2633,12 +2636,15 @@ async function executeOutcomeRun(run, send, agent, options = {}) {
           occurredAt: new Date().toISOString(),
           message: `${definition.label} is still working.`,
         });
+        // The run ends on the cancellation itself; a provider that is slow to
+        // stop must not hold up the cancelled event.
         if (controlRequestsCancellation(response)) {
-          await requestCancel(controlCancellationSource(response));
+          void requestCancel(controlCancellationSource(response));
+          return;
         }
       } catch (error) {
         if (isCompanionPairingInvalidError(error)) {
-          await requestCancel('device_disconnect');
+          void requestCancel('device_disconnect');
           return;
         }
         if (!controlMonitorAbort.signal.aborted && !cancelRequested) {
@@ -3132,7 +3138,7 @@ async function executeOutcomeRun(run, send, agent, options = {}) {
     let previousRepairPrompt = null;
     for (let round = 0; round < OUTCOME_REPAIR_ROUNDS; round += 1) {
       if (typeof harnessTools.assessCompletion === 'function') {
-        await harnessTools.assessCompletion(rawCompletion);
+        await unlessCancelled(harnessTools.assessCompletion(rawCompletion));
         assessedCompletion = rawCompletion;
       }
       const unappliedChangePrompt =
@@ -3205,7 +3211,7 @@ async function executeOutcomeRun(run, send, agent, options = {}) {
       });
     }
     if (typeof harnessTools.assessCompletion === 'function' && assessedCompletion !== rawCompletion) {
-      await harnessTools.assessCompletion(rawCompletion);
+      await unlessCancelled(harnessTools.assessCompletion(rawCompletion));
     }
     const completion =
       typeof harnessTools.finalizeCompletion === 'function'

package/src/framerTools.js

@@ -546,12 +546,37 @@ const __dexterTreeRecorders = {
   makeExternalComponentLocal: (args, result) => __dexterNote(args[0], result),
 };
 const __dexterTreeTarget = { insert: 1 };
+// CMS collections, items, and fields, and pages, are deleted only with the
+// user's permission for this run. The target is read before the call runs.
+const __dexterRefused = [];
+const __dexterContentTypes = new Set(['CollectionNode', 'CollectionItemNode', 'WebPageNode', 'DesignPageNode']);
+const __dexterRefuse = (target, content) => {
+  __dexterRefused.push({ target, content });
+  throw new Error('Deleting ' + content + ' needs the user\\'s permission. Nothing was deleted.');
+};
+const __dexterTreeGuards = __dexterDeletionAllowed ? {} : {
+  remove: (tree, args) => {
+    const id = __dexterIdOf(args[0]);
+    const node = id ? tree.get(id) : null;
+    if (node && __dexterContentTypes.has(node.type)) __dexterRefuse(id, node.type + ' "' + (node.name || id) + '"');
+  },
+  patch: (tree, args) => {
+    const id = __dexterIdOf(args[0]);
+    const next = args[1] && args[1].variables;
+    if (!id || !Array.isArray(next)) return;
+    const node = tree.get(id);
+    if (!node || node.type !== 'CollectionNode' || !Array.isArray(node.variables)) return;
+    const kept = new Set(next.map((variable) => variable && variable.id));
+    const dropped = node.variables.filter((variable) => variable && variable.id && !kept.has(variable.id));
+    if (dropped.length) __dexterRefuse(id, 'the fields ' + dropped.map((variable) => '"' + (variable.name || variable.id) + '"').join(', ') + ' of collection "' + (node.name || id) + '"');
+  },
+};
 const __dexterFileRecorders = Object.fromEntries(['create', 'write', 'applyPatch', 'delete'].map((op) => [op, (args, result) => {
   __dexterFiles.push({ op, path: typeof args[0] === 'string' ? args[0] : '', diagnostics: result && Array.isArray(result.diagnostics) ? result.diagnostics : [] });
 }]));
 // The proxy sits on an empty stand-in that forwards to the real object, so
 // methods can be wrapped even when Framer freezes its API objects.
-const __dexterRecording = (object, recorders, children = {}, compared = new Set(), targets = {}) => new Proxy({}, {
+const __dexterRecording = (object, recorders, children = {}, compared = new Set(), targets = {}, guards = {}) => new Proxy({}, {
   has: (_, key) => Reflect.has(object, key),
   ownKeys: () => Reflect.ownKeys(object),
   getOwnPropertyDescriptor: (_, key) => {
@@ -572,6 +597,7 @@ const __dexterRecording = (object, recorders, children = {}, compared = new Set(
         }
         throw error;
       };
+      if (guards[key]) guards[key](object, args);
       const layer = checked ? __dexterLayerOf(args[0]) : null;
       const before = checked ? __dexterStateOf(object, layer) : null;
       const settle = (result) => {
@@ -591,7 +617,7 @@ const __dexterRecording = (object, recorders, children = {}, compared = new Set(
   },
 });
 const __dexterApi = __dexterRecording(api, {}, {
-  tree: (tree) => __dexterRecording(tree, __dexterTreeRecorders, {}, __dexterCompared, __dexterTreeTarget),
+  tree: (tree) => __dexterRecording(tree, __dexterTreeRecorders, {}, __dexterCompared, __dexterTreeTarget, __dexterTreeGuards),
   files: (files) => __dexterRecording(files, __dexterFileRecorders),
 });
 `;
@@ -714,12 +740,13 @@ export function wrappedReadLineOffset(program) {
   return readParts(program).prefix.split('\n').length - 1;
 }
 
-function wrapperParts(program) {
+function wrapperParts(program, { allowContentDeletion = false } = {}) {
   const { step, body } = splitStep(program);
   // A program that throws still keeps the changes it made before the throw,
   // so the error is caught here and returned with the record of those changes.
   const prefix = `${step}
 ${MEASURE_PRELUDE}
+const __dexterDeletionAllowed = ${allowContentDeletion === true};
 ${RECORDING_PRELUDE}
 let __dexterResult;
 let __dexterError = null;
@@ -731,13 +758,13 @@ try {
 } catch (error) {
   __dexterError = { name: String((error && error.name) || 'Error'), message: String((error && error.message) || error) };
 }
-return { result: __dexterResult, dexterError: __dexterError, dexterFiles: __dexterFiles, dexterTouched: __dexterTouched, dexterFailed: __dexterFailed, dexterUnchanged: __dexterUnchanged };
+return { result: __dexterResult, dexterError: __dexterError, dexterFiles: __dexterFiles, dexterTouched: __dexterTouched, dexterFailed: __dexterFailed, dexterUnchanged: __dexterUnchanged, dexterRefused: __dexterRefused };
 `;
   return { prefix, body, suffix };
 }
 
-export function wrapProgram(program) {
-  const { prefix, body, suffix } = wrapperParts(program);
+export function wrapProgram(program, options) {
+  const { prefix, body, suffix } = wrapperParts(program, options);
   return `${prefix}${body}${suffix}`;
 }
 
@@ -938,6 +965,7 @@ export function createFramerAgentToolRuntime({
   const projectUrl = String(context.framerProjectUrl || '').trim();
   const activePageId = String(context.activePageId || '').trim();
   const allowPublishing = context.permissions?.publish === true;
+  const allowContentDeletion = context.permissions?.deleteContent === true;
   const allowedTools = Array.isArray(assignment?.toolProtocol?.tools)
     ? new Set(assignment.toolProtocol.tools)
     : null;
@@ -1372,9 +1400,20 @@ export function createFramerAgentToolRuntime({
         callExtra.helpers = helpersUsed(program);
         await ensureProject();
         await snapshotUnchanged();
-        const result = await client.exec(wrapProgram(program));
+        const result = await client.exec(wrapProgram(program, { allowContentDeletion }));
         const applied = applyReceipt(result, screenshotNodeIds);
         requirements = renameRequirementNodes(requirements, applied.receipt.renamedIds);
+        const refused = Array.isArray(applied.output?.result?.dexterRefused) ? applied.output.result.dexterRefused : [];
+        if (refused.length) {
+          throw toolError(
+            'FRAMER_AGENT_DELETE_NOT_AUTHORIZED',
+            [
+              `Deleting ${refused.map((entry) => entry.content).join('; ')} needs the user's clear permission in this conversation, which they have not given, so nothing was deleted.`,
+              applied.changed ? 'The other changes this program made before that point were kept.' : '',
+              'If deleting it is still the right step, ask the user one plain question naming exactly what you would delete, and return blocked. When they agree, Dexter gives you that permission in the next run.',
+            ].filter(Boolean).join(' '),
+          );
+        }
         const programError = programErrorOf(applied.output, wrappedLineOffset(program));
         // Layers created by this program only get their real ids once it
         // finishes, so screenshots are taken in a second call.

package/src/protocol.js

@@ -511,12 +511,14 @@ export function buildFramerOutcomePrompt(outcome = {}, product, promptContext =
     'A greeting, thanks, or question that needs no project change is not blocked: answer it in summary without reading or editing the project and return completed.',
     'Set projectChanged to true only when this run applied a change to the Framer project, and list the ids of the layers you changed in changedNodeIds. The summary must describe only changes that were applied. If a requirement is still not met, or you could not find or change something, name it plainly in the summary; never describe it as done.',
     'Some requests need something beyond the layers you may change, such as photos on other pages, a component shared across the site, or site-wide styles. If the user has not decided about it yet, ask one plain question that names it and what changing it affects, and return blocked; when they agree, Dexter gives you that reach in the next run. If they already said no, or told you what to do in that case, do not ask again: do what you can within what you may change, and explain plainly what is in the way, such as which shared setting causes it. Never mention access, scope, permissions, grants, or authorization.',
+    'Deleting CMS collections, items, or fields, or pages, needs the user\'s clear permission in this conversation; context.permissions.deleteContent is true when they gave it. A request to change, fix, or replace content is not permission to delete it. Without it, ask one plain question naming exactly what you would delete and return blocked, before building any replacement for it.',
     'If you changed layers before asking a question, say in your summary what you changed.',
     'When you return blocked, write the question itself in summary, since summary is what the user reads; blockedReason is a short note for Dexter.',
+    'summary is the only text the user reads; checks are for Dexter and are never shown to them. Write summary in Markdown. After an edit, a short, plain answer about what changed is enough. When the user asks a question or asks for a report, audit, review, list, or plan, summary is the full answer, formatted with headings, lists, or tables where they help: never shorten it to a line or put it in checks.',
     'Write in the language the user wrote their request in: the summary, any question, and the sentences Dexter shows while you work. Keep layer names and quoted text as they are.',
     REPAIR_SUMMARY_RULE,
-    'When finished, return exactly one JSON object and no markdown.',
-    '{"status":"completed|blocked|failed","summary":"one or two short, non-technical sentences for the designer","checks":[{"command":"what you verified","status":"passed|failed|skipped","output":"short result"}],"blockedReason":null,"projectChanged":false,"changedNodeIds":[]}',
+    'When finished, return exactly one JSON object with nothing around it. Markdown belongs only inside the summary string.',
+    '{"status":"completed|blocked|failed","summary":"your answer to the designer, in Markdown","checks":[{"command":"what you verified","status":"passed|failed|skipped","output":"short result"}],"blockedReason":null,"projectChanged":false,"changedNodeIds":[]}',
     doctrine
       ? `\nDexter design and execution doctrine (${String(promptContext.doctrineVersion || 'current')}):\n${doctrine}`
       : '',
@@ -581,8 +583,9 @@ export function buildWebflowOutcomePrompt(outcome = {}, product, promptContext =
     'The summary must describe only changes that were applied. If something the user asked for is not done, name it plainly; never describe it as done.',
     'Some requests need something beyond the elements you may change, such as content on other pages or a component used across the site. If the user has not decided about it yet, ask one plain question that names it and what changing it affects, and return blocked. If they already said no, or told you what to do in that case, do not ask again: do what you can within what you may change, and explain plainly what is in the way. If you changed elements before asking, say in your summary what you changed. Never mention access, scope, permissions, grants, or authorization.',
     'Write in the language the user wrote their request in: the summary, any question, and the sentences Dexter shows while you work. Keep element names and quoted text as they are.',
-    'When finished, return exactly one JSON object and no markdown.',
-    '{"status":"completed|blocked|failed","summary":"one or two short, non-technical sentences for the designer","checks":[{"command":"what you verified","status":"passed|failed|skipped","output":"short result"}],"blockedReason":null}',
+    'summary is the only text the user reads; checks are for Dexter and are never shown to them. Write summary in Markdown. After an edit, a short, plain answer about what changed is enough. When the user asks a question or asks for a report, audit, review, list, or plan, summary is the full answer, formatted with headings, lists, or tables where they help: never shorten it to a line or put it in checks.',
+    'When finished, return exactly one JSON object with nothing around it. Markdown belongs only inside the summary string.',
+    '{"status":"completed|blocked|failed","summary":"your answer to the designer, in Markdown","checks":[{"command":"what you verified","status":"passed|failed|skipped","output":"short result"}],"blockedReason":null}',
     doctrine
       ? `\nDexter design and execution doctrine (${String(promptContext.doctrineVersion || 'current')}):\n${doctrine}`
       : '',
@@ -759,7 +762,7 @@ export function normalizeOutcomeCompletion(
     status,
     summary:
       typeof raw.summary === 'string' && raw.summary.trim()
-        ? raw.summary.trim().slice(0, 10_000)
+        ? raw.summary.trim().slice(0, 40_000)
         : 'The harness did not provide a summary.',
     checks,
     blockedReason: