@jay-framework/aiditor 0.20.0 → 0.21.0

package/dist/index.d.ts

@@ -110,11 +110,13 @@ declare const submitTaskAction: _jay_framework_fullstack_component.JayStreamActi
 declare const cancelAgentTaskAction: _jay_framework_fullstack_component.JayAction<{
     pageRoute?: string;
     renderedUrl?: string;
+    cancelKey?: string;
 }, {
     cancelled: boolean;
 }> & _jay_framework_fullstack_component.JayActionDefinition<{
     pageRoute?: string;
     renderedUrl?: string;
+    cancelKey?: string;
 }, {
     cancelled: boolean;
 }, []>;
@@ -384,9 +386,9 @@ declare const generateAddPageBriefFromImageAction: _jay_framework_fullstack_comp
     referenceAttachments?: undefined;
 } | {
     ok: boolean;
-    markdown: string;
-    suggestedRoute: string;
-    suggestedRouteKind: "static" | "dynamic";
+    markdown: any;
+    suggestedRoute: any;
+    suggestedRouteKind: any;
     referenceAttachments: {
         id: string;
         path: string;
@@ -408,9 +410,9 @@ declare const generateAddPageBriefFromImageAction: _jay_framework_fullstack_comp
     referenceAttachments?: undefined;
 } | {
     ok: boolean;
-    markdown: string;
-    suggestedRoute: string;
-    suggestedRouteKind: "static" | "dynamic";
+    markdown: any;
+    suggestedRoute: any;
+    suggestedRouteKind: any;
     referenceAttachments: {
         id: string;
         path: string;

package/dist/index.js

@@ -1,3 +1,6 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { makeJayQuery, makeJayStream, makeJayStackComponent, phaseOutput, RenderPipeline } from "@jay-framework/fullstack-component";
 import { DEV_SERVER_SERVICE } from "@jay-framework/dev-server";
 import fs, { readFile, readdir } from "fs/promises";
@@ -1086,11 +1089,12 @@ function appendVisualAttachmentLines(body, attachments, indent = "") {
     return;
   }
   body.push(
-    `${indent}Attachments (read from disk; belong to this annotation only):`
+    `${indent}Attachments (read from disk; belong to this annotation only; match "image #N" in the instruction):`
   );
-  for (const att of attachments) {
+  for (let i = 0; i < attachments.length; i++) {
+    const att = attachments[i];
     body.push(
-      `${indent}- ${att.taskCopyPath} (filename: ${att.originalFileName})`
+      `${indent}- Image #${i + 1}: ${att.taskCopyPath} (filename: ${att.originalFileName})`
     );
   }
 }
@@ -1265,6 +1269,13 @@ function buildVisualPromptVideo(config, pageRoute, renderedUrl, videoPath, frame
   }
   return [...preamble, ...body].join("\n");
 }
+function distinctTimeSecsAscending(annotations) {
+  const s = /* @__PURE__ */ new Set();
+  for (const a of annotations) {
+    s.add(a.timeSec);
+  }
+  return [...s].sort((a, b) => a - b);
+}
 function persistFile(file, destDir, fileName) {
   fs$1.mkdirSync(destDir, { recursive: true });
   const dest = path.join(destDir, fileName ?? file.name);
@@ -1309,14 +1320,13 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
     }
     const extra = input.extraFiles ?? {};
     const frames = [];
+    const momentTimes = parsed.structuredVideo ? distinctTimeSecsAscending(parsed.structuredVideo.annotations) : [];
     for (let i = 0; ; i++) {
       const markers = extra[`frame_${i}_markers_only`];
       const clean = extra[`frame_${i}_clean`];
       if (!markers && !clean) break;
       const frameDir = path.join(taskDir, "frames", String(i));
-      const timeSec = parsed.structuredVideo?.annotations.find(
-        (a, idx) => idx === i || a.timeSec !== void 0
-      )?.timeSec ?? i;
+      const timeSec = momentTimes[i] ?? i;
       frames.push({
         timeSec,
         frameIndex: i,
@@ -1456,17 +1466,19 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
 });
 const cancelAgentTaskAction = makeJayQuery(
   "aiditor.cancelAgentTask"
-).withHandler(async (input) => {
-  const routeKey = resolveAgentContextKey({
-    pageRoute: input.pageRoute ?? "/",
-    renderedUrl: input.renderedUrl
-  });
-  const cancelled = cancelAgentTask(routeKey);
-  if (!cancelled) {
-    forceReleaseAgentRoute(routeKey);
+).withHandler(
+  async (input) => {
+    const routeKey = input.cancelKey?.trim() || resolveAgentContextKey({
+      pageRoute: input.pageRoute ?? "/",
+      renderedUrl: input.renderedUrl
+    });
+    const cancelled = cancelAgentTask(routeKey);
+    if (!cancelled) {
+      forceReleaseAgentRoute(routeKey);
+    }
+    return { cancelled: true };
   }
-  return { cancelled: true };
-});
+);
 class AddPagePromptLoadError extends Error {
   constructor(message) {
     super(message);
@@ -2292,6 +2304,12 @@ When the image is a formal Figma **design definitions** board, apply these rules
 ${designDefinitionsBody}`;
   });
 }
+class BriefFillCancelledError extends Error {
+  constructor() {
+    super("Stopped by user.");
+    __publicField(this, "name", "BriefFillCancelledError");
+  }
+}
 const briefFillModelOverride = process.env.AIDITOR_BRIEF_FILL_MODEL?.trim();
 const ALLOWED_IMAGE_MIMES = /* @__PURE__ */ new Set([
   "image/png",
@@ -2459,6 +2477,9 @@ async function runBriefFillAgentQuery(input) {
       thinking: { type: "disabled" }
     }
   })) {
+    if (input.cancelKey && isAgentTaskCancelled(input.cancelKey)) {
+      throw new BriefFillCancelledError();
+    }
     collected.push(message);
   }
   const rawText = extractBriefFillRawText(collected);
@@ -2487,6 +2508,19 @@ async function generateBriefFromImages(input, options) {
   }
   return { markdown };
 }
+const BRIEF_FILL_CANCEL_PREFIX = "brief-fill:";
+function resolveBriefFillCancelKey(input) {
+  const targetSuffix = input.target ? `:${input.target}` : "";
+  const requestId = input.requestId?.trim();
+  if (requestId) {
+    return `${BRIEF_FILL_CANCEL_PREFIX}request:${requestId}${targetSuffix}`;
+  }
+  const route = input.pageRoute?.trim();
+  if (route) {
+    return `${BRIEF_FILL_CANCEL_PREFIX}route:${normalizePageRoute(route)}${targetSuffix}`;
+  }
+  return `${BRIEF_FILL_CANCEL_PREFIX}draft${targetSuffix}`;
+}
 function persistUpload(file, destPath) {
   fs$1.mkdirSync(path.dirname(destPath), { recursive: true });
   fs$1.copyFileSync(file.path, destPath);
@@ -2826,15 +2860,27 @@ const generateAddPageBriefFromImageAction = makeJayQuery(
     }
     try {
       const images = imageFiles.map(readImageAsBase64);
-      const result = await generateBriefFromImages(
-        {
-          target: input.target,
-          images,
-          contextNotes: input.contextNotes,
-          pageRoute: input.pageRoute
-        },
-        { projectDir }
-      );
+      const cancelKey = resolveBriefFillCancelKey({
+        requestId: input.requestId,
+        pageRoute: input.pageRoute,
+        target: input.target
+      });
+      const cancelToken = beginCancellableAgentTask(cancelKey);
+      let result;
+      try {
+        result = await generateBriefFromImages(
+          {
+            target: input.target,
+            images,
+            contextNotes: input.contextNotes,
+            pageRoute: input.pageRoute,
+            cancelKey
+          },
+          { projectDir }
+        );
+      } finally {
+        endCancellableAgentTask(cancelKey, cancelToken);
+      }
       const referenceAttachments = [];
       if (input.requestId) {
         for (const file of imageFiles) {
@@ -2863,6 +2909,9 @@ const generateAddPageBriefFromImageAction = makeJayQuery(
         referenceAttachments
       };
     } catch (err) {
+      if (err instanceof BriefFillCancelledError) {
+        return { ok: false, error: err.message };
+      }
       return {
         ok: false,
         error: err instanceof Error ? err.message : String(err)

package/dist/pages/aiditor/page.css

@@ -865,14 +865,54 @@ body {
   min-width: 200px;
 }
 .url-bar {
+  display: flex;
+  align-items: center;
+  gap: 4px;
   font-size: 12px;
   font-family: var(--harmony-mono);
   color: var(--harmony-text-secondary);
   background: var(--harmony-bg-surface);
   border: 1px solid var(--harmony-border);
   border-radius: var(--harmony-radius-sm);
-  padding: 7px 12px;
-  word-break: break-all;
+  padding: 4px 4px 4px 12px;
+}
+.url-bar-text {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.url-bar-open-tab {
+  flex-shrink: 0;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border: none;
+  border-radius: var(--harmony-radius-sm);
+  background: transparent;
+  color: var(--harmony-text-muted);
+  cursor: pointer;
+  transition: color 0.12s ease, background 0.12s ease;
+}
+.url-bar-open-tab:hover:not(:disabled) {
+  color: var(--harmony-text);
+  background: var(--harmony-bg-hover);
+}
+.url-bar-open-tab:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+.url-bar-open-tab:focus-visible {
+  outline: 2px solid var(--harmony-primary);
+  outline-offset: 1px;
+}
+.url-bar-open-tab .harmony-routes-panel-open-tab-icon {
+  width: 24px;
+  height: 24px;
 }
 
 .preview-loading {
@@ -1179,6 +1219,19 @@ body {
 .visual-attachment-remove-file:hover {
   color: var(--harmony-danger);
 }
+.visual-attachment-chip-actions {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 2px;
+  flex-shrink: 0;
+}
+.visual-attachment-number {
+  font-size: 10px;
+  font-weight: 600;
+  color: var(--harmony-primary);
+  line-height: 1;
+}
 .file-input-hidden {
   display: none;
 }
@@ -2544,12 +2597,28 @@ body {
   padding: 24px;
   box-sizing: border-box;
 }
+.add-page-brief-fill-popover-stack {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 10px;
+  width: min(420px, 100%);
+  max-height: 90%;
+}
+.add-page-brief-fill-stop-confirm {
+  align-self: center;
+  max-width: 100%;
+  white-space: normal;
+  text-align: center;
+  flex-wrap: wrap;
+  justify-content: center;
+}
 .add-page-brief-fill-panel {
   background: var(--harmony-bg-surface);
   border: 1px solid var(--harmony-border);
   border-radius: var(--harmony-radius-md);
-  width: min(420px, 100%);
-  max-height: 90%;
+  width: 100%;
+  max-height: 100%;
   overflow: auto;
   padding: 14px 16px;
   display: flex;