@jay-framework/aiditor 0.21.0 → 0.22.0

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import * as _jay_framework_dev_server from '@jay-framework/dev-server';
 import * as _jay_framework_fullstack_component from '@jay-framework/fullstack-component';
 import { JayFile } from '@jay-framework/fullstack-component';
+import { AddMenuCatalogLintWarning, AddMenuItem, AddMenuPresentation, AddMenuBrowseSize } from '@jay-framework/plugin-validator';
+export { AddMenuItem, AddMenuPresentation } from '@jay-framework/plugin-validator';
 import { PluginSetupContext, PluginSetupResult } from '@jay-framework/stack-server-runtime';
 export { aiditorPage, aiditorShell } from './index.client.js';
 import '@jay-framework/component';
@@ -121,26 +123,13 @@ declare const cancelAgentTaskAction: _jay_framework_fullstack_component.JayActio
     cancelled: boolean;
 }, []>;
 
-/** Design Log #19 — Add Menu agreement types (M19.1). */
-type AddMenuInteraction = {
-    mode: "reference" | "stage-place";
-    persistOnPage?: boolean;
-    stagePromptTemplate?: string;
-};
-type AddMenuItem = {
-    /** Stable unique id, convention: `<pluginName>:<slug>` */
-    id: string;
-    title: string;
-    /** Menu navigation label — not a type system */
-    category: string;
-    /** Injected verbatim into agent prompt when attached */
-    prompt: string;
-    pluginName?: string;
-    packageName?: string;
-    subCategory?: string;
-    thumbnail?: string;
-    interaction?: AddMenuInteraction;
-};
+/**
+ * AIditor Add Menu runtime types.
+ * Catalog item schema types come from @jay-framework/plugin-validator (source of truth).
+ */
+
+/** Runtime catalog warning — same shape as plugin-validator lint findings. */
+type AddMenuCatalogWarning = AddMenuCatalogLintWarning;
 type AddMenuAttachment = {
     itemId: string;
     /** Change Request: set when chip is on a marker; omit = request-level */
@@ -163,7 +152,7 @@ type AddMenuSubCategoryGroup = {
 type ListAddMenuItemsResult = {
     items: AddMenuItem[];
     categories: AddMenuCategoryGroup[];
-    warnings: string[];
+    warnings: AddMenuCatalogWarning[];
 };
 
 type PageBriefAttachment = {
@@ -765,7 +754,6 @@ type PageAssetEntry = {
     source: PageAssetSource;
     itemId?: string;
     thumbnail?: string;
-    persistOnPage: boolean;
     addedAt: string;
     /** Stable key for detected entries — used for sync + suppression */
     detectedKey?: string;
@@ -863,4 +851,14 @@ declare const runAiditorPublishAction: _jay_framework_fullstack_component.JayStr
 
 declare function setupAiditor(ctx: PluginSetupContext): Promise<PluginSetupResult>;
 
-export { cancelAgentTaskAction, checkAddPageRouteAction, checkAiditorPublishAction, checkPageAddPageBriefAction, checkPluginUpdateAction, ensureProjectPluginAction, generateAddPageBriefFromImageAction, getAiditorBootstrap, getContractInspectorTagsAction, getPageAssetsAction, getPageMetaAction, getPageParamsAction, getPluginSetupStatusAction, getProjectInfoAction, listAddMenuItemsAction, listFreezesAction, listJayPluginsAction, listPluginContractsAction, openAddPageFromBriefAction, readFileAction, reclassifyAddPageAssetAction, rerunPluginSetupAction, resolveAddMenuContractParamsAction, runAiditorPublishAction, saveAddPageDraftAction, savePageAssetsAction, savePageMetaAction, setupAiditor, startAddPageRequestAction, submitAddPageAction, submitTaskAction, syncAddMenuAttachmentsAction, syncAddPagePluginManifestAction, syncDetectedPageAssetsAction, uploadAddPageAssetAction, writePluginSourceAction };
+declare function listAddMenuItems(projectRoot: string): Promise<ListAddMenuItemsResult>;
+
+declare function sanitizeAddMenuHtmlFragment(html: string): string;
+
+/** Normalize legacy `thumbnail` and explicit `presentation` to one shape (Design Log #30). */
+declare function normalizeAddMenuPresentation(item: Pick<AddMenuItem, "thumbnail" | "presentation">): AddMenuPresentation | undefined;
+
+/** Default browse footprint — Design Log #32. */
+declare function normalizeAddMenuBrowseSize(item: Pick<AddMenuItem, "browse">): AddMenuBrowseSize;
+
+export { type AddMenuCatalogWarning, type ListAddMenuItemsResult, cancelAgentTaskAction, checkAddPageRouteAction, checkAiditorPublishAction, checkPageAddPageBriefAction, checkPluginUpdateAction, ensureProjectPluginAction, generateAddPageBriefFromImageAction, getAiditorBootstrap, getContractInspectorTagsAction, getPageAssetsAction, getPageMetaAction, getPageParamsAction, getPluginSetupStatusAction, getProjectInfoAction, listAddMenuItems, listAddMenuItemsAction, listFreezesAction, listJayPluginsAction, listPluginContractsAction, normalizeAddMenuBrowseSize, normalizeAddMenuPresentation, openAddPageFromBriefAction, readFileAction, reclassifyAddPageAssetAction, rerunPluginSetupAction, resolveAddMenuContractParamsAction, runAiditorPublishAction, sanitizeAddMenuHtmlFragment, saveAddPageDraftAction, savePageAssetsAction, savePageMetaAction, setupAiditor, startAddPageRequestAction, submitAddPageAction, submitTaskAction, syncAddMenuAttachmentsAction, syncAddPagePluginManifestAction, syncDetectedPageAssetsAction, uploadAddPageAssetAction, writePluginSourceAction };

package/dist/index.js

@@ -9,6 +9,7 @@ import { query } from "@anthropic-ai/claude-agent-sdk";
 import fs$1 from "fs";
 import crypto from "crypto";
 import yaml, { load } from "js-yaml";
+import { validateAddMenuCatalogFile, lintAddMenuCatalog } from "@jay-framework/plugin-validator";
 import { getLogger } from "@jay-framework/logger";
 import { fileURLToPath } from "url";
 import { spawn } from "child_process";
@@ -341,131 +342,10 @@ function groupAddMenuItems(items) {
       return sa.localeCompare(sb);
     }).map(([subCategory, subItems]) => ({
       subCategory,
-      items: subItems.sort((a, b) => a.title.localeCompare(b.title))
+      items: subItems
     }))
   }));
 }
-const REJECTED_ITEM_FIELDS = [
-  "kind",
-  "parameters",
-  "component",
-  "allowedScopes"
-];
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function requiredString(obj, field, path2, errors) {
-  const value = obj[field];
-  if (typeof value !== "string" || value.trim().length === 0) {
-    errors.push({
-      path: `${path2}.${field}`,
-      message: "required non-empty string"
-    });
-    return null;
-  }
-  return value.trim();
-}
-function optionalString(obj, field) {
-  const value = obj[field];
-  if (value === void 0) return void 0;
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : void 0;
-}
-function optionalBoolean(obj, field) {
-  const value = obj[field];
-  return typeof value === "boolean" ? value : void 0;
-}
-function validateInteraction(raw, path2, errors) {
-  if (raw === void 0) return void 0;
-  if (!isRecord(raw)) {
-    errors.push({ path: path2, message: "interaction must be an object" });
-    return void 0;
-  }
-  const mode = raw.mode;
-  if (mode !== "reference" && mode !== "stage-place") {
-    errors.push({
-      path: `${path2}.mode`,
-      message: 'mode must be "reference" or "stage-place"'
-    });
-    return void 0;
-  }
-  return {
-    mode,
-    persistOnPage: optionalBoolean(raw, "persistOnPage"),
-    stagePromptTemplate: optionalString(raw, "stagePromptTemplate")
-  };
-}
-function validateAddMenuItem(raw, path2) {
-  const errors = [];
-  if (!isRecord(raw)) {
-    return {
-      item: null,
-      errors: [{ path: path2, message: "item must be an object" }]
-    };
-  }
-  for (const field of REJECTED_ITEM_FIELDS) {
-    if (field in raw) {
-      errors.push({
-        path: `${path2}.${field}`,
-        message: `field "${field}" is not allowed in Add Menu catalog items`
-      });
-    }
-  }
-  const id = requiredString(raw, "id", path2, errors);
-  const title = requiredString(raw, "title", path2, errors);
-  const category = requiredString(raw, "category", path2, errors);
-  const prompt = requiredString(raw, "prompt", path2, errors);
-  if (errors.length > 0 || !id || !title || !category || !prompt) {
-    return { item: null, errors };
-  }
-  const interaction = validateInteraction(
-    raw.interaction,
-    `${path2}.interaction`,
-    errors
-  );
-  return {
-    item: {
-      id,
-      title,
-      category,
-      prompt,
-      pluginName: optionalString(raw, "pluginName"),
-      packageName: optionalString(raw, "packageName"),
-      subCategory: optionalString(raw, "subCategory"),
-      thumbnail: optionalString(raw, "thumbnail"),
-      ...interaction ? { interaction } : {}
-    },
-    errors
-  };
-}
-function validateAddMenuCatalogFile(raw, sourcePath) {
-  const errors = [];
-  if (!isRecord(raw)) {
-    return {
-      file: null,
-      errors: [{ path: sourcePath, message: "catalog file must be an object" }]
-    };
-  }
-  if (!Array.isArray(raw.items)) {
-    return {
-      file: null,
-      errors: [
-        { path: `${sourcePath}.items`, message: "items must be an array" }
-      ]
-    };
-  }
-  const items = [];
-  raw.items.forEach((entry, index) => {
-    const result = validateAddMenuItem(entry, `${sourcePath}.items[${index}]`);
-    errors.push(...result.errors);
-    if (result.item) items.push(result.item);
-  });
-  if (items.length === 0 && errors.length > 0) {
-    return { file: null, errors };
-  }
-  return { file: { items }, errors };
-}
 function parsePluginsIndexYaml(yaml2) {
   const entries = [];
   let currentPlugin = null;
@@ -591,6 +471,7 @@ async function parsePluginYamlContracts(projectRoot, pluginName) {
   }
 }
 const ADD_MENU_DIR = path.join("agent-kit", "aiditor", "add-menu");
+const LOCAL_PLUGINS_DIR = path.join("src", "plugins");
 function packageNameFromItem(item) {
   if (item.packageName) return item.packageName;
   if (item.pluginName) return `@jay-framework/${item.pluginName}`;
@@ -606,6 +487,39 @@ function pluginNameFromItem(item) {
   if (colon > 0) return item.id.slice(0, colon);
   return null;
 }
+async function getLocalPluginNames(projectRoot) {
+  const names = /* @__PURE__ */ new Set();
+  const pluginsDir = path.join(projectRoot, LOCAL_PLUGINS_DIR);
+  let entries;
+  try {
+    entries = await fs.readdir(pluginsDir);
+  } catch (e) {
+    const code = e && typeof e === "object" && "code" in e ? e.code : void 0;
+    if (code === "ENOENT") return names;
+    throw e;
+  }
+  for (const entry of entries) {
+    const pluginYaml = path.join(pluginsDir, entry, "plugin.yaml");
+    try {
+      const yaml2 = await fs.readFile(pluginYaml, "utf-8");
+      const nameMatch = yaml2.match(/^name:\s*(.+)\s*$/m);
+      if (nameMatch?.[1]) {
+        names.add(nameMatch[1].trim());
+        continue;
+      }
+    } catch {
+    }
+    names.add(entry);
+  }
+  return names;
+}
+function validationErrorToWarning(err) {
+  return {
+    code: err.code ?? "catalog-validation-error",
+    message: `${err.path}: ${err.message}`,
+    sourcePath: err.path
+  };
+}
 async function listAddMenuItems(projectRoot) {
   const addMenuDir = path.join(projectRoot, ADD_MENU_DIR);
   const warnings = [];
@@ -623,43 +537,67 @@ async function listAddMenuItems(projectRoot) {
   const installed = await getInstalledPlugins(projectRoot);
   const installedPackages = new Set(installed.map((p) => p.packageName));
   const installedPlugins = new Set(installed.map((p) => p.pluginName));
+  for (const localName of await getLocalPluginNames(projectRoot)) {
+    installedPlugins.add(localName);
+  }
   const byId = /* @__PURE__ */ new Map();
+  const orderedIds = [];
+  const lintBlockedIds = /* @__PURE__ */ new Set();
   for (const filePath of yamlFiles) {
     const relPath = path.relative(projectRoot, filePath);
     let rawContent;
     try {
       rawContent = await fs.readFile(filePath, "utf-8");
     } catch {
-      warnings.push(`Could not read Add Menu catalog file: ${relPath}`);
+      warnings.push({
+        code: "catalog-read-error",
+        message: `Could not read Add Menu catalog file: ${relPath}`,
+        sourcePath: relPath
+      });
       continue;
     }
     let parsed;
     try {
       parsed = load(rawContent);
     } catch (err) {
-      warnings.push(
-        `Invalid YAML in ${relPath}: ${err instanceof Error ? err.message : String(err)}`
-      );
+      warnings.push({
+        code: "catalog-parse-error",
+        message: `Invalid YAML in ${relPath}: ${err instanceof Error ? err.message : String(err)}`,
+        sourcePath: relPath
+      });
       continue;
     }
     const validated = validateAddMenuCatalogFile(parsed, relPath);
-    if (validated.errors.length > 0) {
-      for (const err of validated.errors) {
-        warnings.push(`${err.path}: ${err.message}`);
-      }
+    for (const err of validated.errors) {
+      warnings.push(validationErrorToWarning(err));
+    }
+    if (!validated.file) {
       continue;
     }
+    const linted = lintAddMenuCatalog(validated.file.items, relPath);
+    for (const err of linted.errors) {
+      warnings.push(err);
+      if (err.itemId) lintBlockedIds.add(err.itemId);
+    }
+    warnings.push(...linted.warnings);
     for (const item of validated.file.items) {
+      if (lintBlockedIds.has(item.id)) continue;
       const prev = byId.get(item.id);
       if (prev) {
-        warnings.push(
-          `Duplicate Add Menu item id "${item.id}": "${prev.sourcePath}" overwritten by "${relPath}"`
-        );
+        warnings.push({
+          code: "catalog-duplicate-id",
+          message: `Duplicate Add Menu item id "${item.id}": "${prev.sourcePath}" overwritten by "${relPath}"`,
+          itemId: item.id,
+          sourcePath: relPath
+        });
+        byId.set(item.id, { item, sourcePath: relPath });
+        continue;
       }
       byId.set(item.id, { item, sourcePath: relPath });
+      orderedIds.push(item.id);
     }
   }
-  const merged = [...byId.values()].map((entry) => entry.item);
+  const merged = orderedIds.map((id) => byId.get(id)?.item).filter((item) => item !== void 0);
   const filtered = merged.filter((item) => {
     const pkg = packageNameFromItem(item);
     const plugin = pluginNameFromItem(item);
@@ -668,7 +606,7 @@ async function listAddMenuItems(projectRoot) {
     return false;
   });
   return {
-    items: filtered.sort((a, b) => a.title.localeCompare(b.title)),
+    items: filtered,
     categories: groupAddMenuItems(filtered),
     warnings
   };
@@ -941,7 +879,7 @@ function buildRouteMigrationPromptSection(routeMigration) {
   ].join("\n");
 }
 function buildPageAssetsPromptSection(assets) {
-  const active = assets.filter((a) => a.persistOnPage && !a.userRemoved);
+  const active = assets.filter((a) => !a.userRemoved);
   if (active.length === 0) return "";
   const lines = [
     "Page assets (in scope for this page — use when referenced in marker instructions or @mentions):"
@@ -4423,7 +4361,6 @@ function detectedToPageAssetEntry(detected) {
     prompt: detected.prompt,
     source: "detected",
     itemId: detected.pluginName ? `${detected.pluginName}:${detected.contractName ?? ""}` : void 0,
-    persistOnPage: true,
     addedAt: (/* @__PURE__ */ new Date()).toISOString(),
     detectedKey: detected.detectedKey,
     detectedMeta: {
@@ -4645,6 +4582,34 @@ async function setupAiditor(ctx) {
     ...filesUpdated.length > 0 ? { filesUpdated } : {}
   };
 }
+const BLOCKED_TAGS = /<\s*(script|iframe|object|embed)\b[^>]*>[\s\S]*?<\/\s*\1\s*>|<\s*(script|iframe|object|embed)\b[^>]*\/?>/gi;
+const EVENT_HANDLER_ATTR = /\s+on[a-z]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/gi;
+const JAVASCRIPT_URL = /\b(href|src|xlink:href)\s*=\s*("|')\s*javascript:/gi;
+function sanitizeAddMenuHtmlFragment(html) {
+  let result = html;
+  result = result.replace(BLOCKED_TAGS, "");
+  BLOCKED_TAGS.lastIndex = 0;
+  result = result.replace(EVENT_HANDLER_ATTR, "");
+  EVENT_HANDLER_ATTR.lastIndex = 0;
+  result = result.replace(JAVASCRIPT_URL, "");
+  JAVASCRIPT_URL.lastIndex = 0;
+  return result.trim();
+}
+function isGifPath(src) {
+  return /\.gif($|\?)/i.test(src.trim());
+}
+function normalizeAddMenuPresentation(item) {
+  if (item.presentation) return item.presentation;
+  const thumbnail = item.thumbnail?.trim();
+  if (!thumbnail) return void 0;
+  if (isGifPath(thumbnail)) {
+    return { type: "gif", src: thumbnail };
+  }
+  return { type: "image", src: thumbnail };
+}
+function normalizeAddMenuBrowseSize(item) {
+  return item.browse?.size ?? "medium";
+}
 const aiditorShell = makeJayStackComponent().withProps().withSlowlyRender(async () => {
   return phaseOutput({}, { headline: "AIditor" });
 }).withFastRender(async (_props, carryForward) => {
@@ -4675,16 +4640,20 @@ export {
   getPageParamsAction,
   getPluginSetupStatusAction,
   getProjectInfoAction,
+  listAddMenuItems,
   listAddMenuItemsAction,
   listFreezesAction,
   listJayPluginsAction,
   listPluginContractsAction,
+  normalizeAddMenuBrowseSize,
+  normalizeAddMenuPresentation,
   openAddPageFromBriefAction,
   readFileAction,
   reclassifyAddPageAssetAction,
   rerunPluginSetupAction,
   resolveAddMenuContractParamsAction,
   runAiditorPublishAction,
+  sanitizeAddMenuHtmlFragment,
   saveAddPageDraftAction,
   savePageAssetsAction,
   savePageMetaAction,

package/dist/pages/aiditor/page.css

@@ -290,7 +290,7 @@ body {
   padding: 5px 8px;
   background: var(--harmony-bg-surface);
   border: 1px solid var(--harmony-border);
-  border-radius: var(--harmony-radius-pill);
+  border-radius: 8px;
   box-shadow:
     0 6px 28px rgba(22, 45, 61, 0.14),
     0 2px 6px rgba(22, 45, 61, 0.06);
@@ -896,7 +896,9 @@ body {
   background: transparent;
   color: var(--harmony-text-muted);
   cursor: pointer;
-  transition: color 0.12s ease, background 0.12s ease;
+  transition:
+    color 0.12s ease,
+    background 0.12s ease;
 }
 .url-bar-open-tab:hover:not(:disabled) {
   color: var(--harmony-text);
@@ -1602,11 +1604,24 @@ body {
   max-height: 94vh;
   display: flex;
   flex-direction: column;
-  gap: 10px;
-  padding: 14px 16px;
+  gap: 24px;
+  padding: 32px 32px;
   overflow: hidden;
   box-shadow: var(--harmony-shadow-lg);
 }
+.video-review-panel {
+  position: relative;
+}
+.video-review-header {
+  align-items: flex-start;
+  padding-right: 28px;
+}
+.video-review-panel .harmony-modal-close {
+  position: absolute;
+  top: 12px;
+  right: 12px;
+  z-index: 1;
+}
 .video-review-body {
   display: flex;
   flex-direction: column;
@@ -1614,23 +1629,27 @@ body {
   min-height: 0;
   flex: 1 1 auto;
 }
-.video-review-tools {
-  display: inline-flex;
-  flex-wrap: nowrap;
-  gap: 2px;
-  align-items: center;
-  width: fit-content;
-}
-.video-review-tools .visual-tool-btn {
-  padding: 7px 8px;
-  min-width: 28px;
-}
 .video-review-capture-root {
+  position: relative;
   flex: 0 1 auto;
   min-height: 0;
   max-height: min(56vh, 480px);
   overflow: hidden;
 }
+.video-review-toolbar-wrap {
+  position: absolute;
+  bottom: 12px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 12;
+  pointer-events: none;
+}
+.video-review-toolbar-wrap > * {
+  pointer-events: auto;
+}
+.video-review-toolbar-wrap .annotate-dock {
+  border-radius: 8px;
+}
 .video-review-capture-root .preview-frame {
   width: 100%;
   height: auto;
@@ -1638,6 +1657,9 @@ body {
   max-height: min(56vh, 480px);
   object-fit: contain;
   display: block;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 8px;
+  box-sizing: border-box;
 }
 .snapshot-panel {
   width: min(1200px, 96vw);
@@ -1647,10 +1669,12 @@ body {
 .snapshot-header {
   display: flex;
   justify-content: space-between;
-  align-items: center;
   gap: 12px;
   flex-wrap: wrap;
 }
+.snapshot-header {
+  align-items: center;
+}
 .video-review-title,
 .snapshot-title {
   font-size: 15px;
@@ -1658,9 +1682,21 @@ body {
   color: var(--harmony-text);
   margin: 0;
 }
-.video-review-meta {
+.video-review-title {
+  font-size: 20px;
+}
+.video-review-subtitle {
+  font-size: 16px;
+  color: var(--harmony-text-secondary);
+  margin: 4px 0 0;
+  line-height: 1.35;
+}
+.video-review-time {
+  flex-shrink: 0;
   font-size: 12px;
   color: var(--harmony-text-muted);
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 .snapshot-tools {
   display: flex;
@@ -2304,7 +2340,7 @@ body {
 .add-menu-picker-search-icon {
   color: var(--harmony-text-muted);
   font-size: 30px;
-  line-height: 1;
+  line-height: 0;
   flex-shrink: 0;
 }
 .add-menu-picker-search-input {
@@ -3874,7 +3910,7 @@ body {
 }
 .add-menu-dock-subhint {
   margin: 0;
-  padding: 8px 18px 0;
+  padding: 2px 18px 6px;
   font-size: 12px;
   line-height: 1.35;
   color: var(--harmony-text-secondary);