@aexol/opencode-wizard 0.3.7 → 0.3.9

package/dist/server/runtime.js

@@ -21,9 +21,34 @@ export { buildSystemNote, resolvePluginStatusSnapshot, toPluginAuthStateSummary,
 const importOpencodePluginModule = new Function('specifier', 'return import(specifier)');
 export { resolvePluginStatusSnapshotWithAuthBootstrap } from './auth-bootstrap.js';
 export { setPublishedSkillIgnored, setPublishedSkillInstalled } from './preferences.js';
-const getDetailCacheKey = (catalogCacheKey, skillVersionId) => {
-  return JSON.stringify([catalogCacheKey, skillVersionId]);
+const getDetailCacheKey = (catalogCacheKey, skillVersionId, revision) => {
+  return JSON.stringify([catalogCacheKey, skillVersionId, revision]);
 };
+const getPublishedSkillRevision = item => {
+  return item.publishedArtifact.revision ?? `${item.publishedArtifact.checksum}:${item.publishedArtifact.updatedAtCursor ?? item.publishedArtifact.publishedAt}`;
+};
+const getCatalogCursor = (items, catalogItems) => {
+  return [...items.map(getPublishedSkillRevision), ...catalogItems.map(item => getPublishedSkillRevision({
+    ...item,
+    assignmentSource: 'CATALOG',
+    assignmentType: 'PATH',
+    scopePath: '',
+    includeChildren: true
+  }))].sort().join('|');
+};
+const getWizardArtifactRevision = item => {
+  return item.artifactVersion.revision ?? `${item.artifactVersion.checksum}:${item.artifactVersion.updatedAtCursor ?? item.artifactVersion.publishedAt ?? 'unpublished'}`;
+};
+const getWizardArtifactCatalogCursor = (items, catalogItems) => {
+  return [...items.map(getWizardArtifactRevision), ...catalogItems.map(getWizardArtifactRevision)].sort().join('|');
+};
+const toWizardArtifactCatalogCursorItems = items => items.map(item => ({
+  ...item,
+  assignmentSource: 'CATALOG',
+  assignmentType: 'PATH',
+  scopePath: '',
+  includeChildren: true
+}));
 const getDetailInflightKey = (catalogCacheKey, skillVersionId, purpose) => {
   return JSON.stringify([catalogCacheKey, skillVersionId, purpose]);
 };
@@ -102,7 +127,9 @@ export const OpencodeWizardSkillsPlugin = async input => {
   const cache = new Map();
   const catalogInflight = new Map();
   const detailCache = new Map();
+  const wizardArtifactDetailCache = new Map();
   const detailInflight = new Map();
+  const wizardArtifactDetailInflight = new Map();
   const initialAuthState = await resolveStoredAuthState(input.worktree, config);
   const loginBootstrap = {
     promise: null,
@@ -197,7 +224,9 @@ export const OpencodeWizardSkillsPlugin = async input => {
     cache.clear();
     catalogInflight.clear();
     detailCache.clear();
+    wizardArtifactDetailCache.clear();
     detailInflight.clear();
+    wizardArtifactDetailInflight.clear();
   };
   const persistAuthState = async session => {
     const authState = toAuthState(session);
@@ -337,7 +366,8 @@ export const OpencodeWizardSkillsPlugin = async input => {
       });
       cache.set(cacheKey, {
         result: fetchResult,
-        expiresAt: Date.now() + CACHE_TTL_MS
+        expiresAt: Date.now() + CACHE_TTL_MS,
+        cursor: fetchResult.ok ? getCatalogCursor(fetchResult.payload.skills, fetchResult.payload.catalogSkills) : fetchResult.fetchedAt
       });
       return {
         directoryPath,
@@ -362,7 +392,8 @@ export const OpencodeWizardSkillsPlugin = async input => {
     const directoryPath = workspaceResolution.directoryPath;
     const preferenceContext = await resolvePublishedSkillPreferenceCacheContext(config);
     const catalogCacheKey = getCatalogCacheKey(workspaceResolution, preferenceContext);
-    const cacheKey = getDetailCacheKey(catalogCacheKey, item.skillVersion.id);
+    const itemRevision = getPublishedSkillRevision(item);
+    const cacheKey = getDetailCacheKey(catalogCacheKey, item.skillVersion.id, itemRevision);
     const inflightKey = getDetailInflightKey(catalogCacheKey, item.skillVersion.id, purpose);
     const cached = detailCache.get(cacheKey);
     if (useCache && cached && cached.expiresAt > Date.now()) {
@@ -412,7 +443,8 @@ export const OpencodeWizardSkillsPlugin = async input => {
       }
       detailCache.set(cacheKey, {
         artifact: detailResult.artifact,
-        expiresAt: Date.now() + CACHE_TTL_MS
+        expiresAt: Date.now() + CACHE_TTL_MS,
+        revision: itemRevision
       });
       return {
         ok: true,
@@ -429,6 +461,62 @@ export const OpencodeWizardSkillsPlugin = async input => {
       detailInflight.delete(inflightKey);
     }
   };
+  const loadWizardArtifactDetail = async ({
+    workspaceResolution,
+    item,
+    signal,
+    useCache,
+    purpose,
+    artifactKind
+  }) => {
+    const preferenceContext = await resolvePublishedSkillPreferenceCacheContext(config);
+    const catalogCacheKey = getCatalogCacheKey(workspaceResolution, preferenceContext);
+    const itemRevision = getWizardArtifactRevision(item);
+    const cacheKey = getDetailCacheKey(catalogCacheKey, item.artifactVersion.id, itemRevision);
+    const inflightKey = JSON.stringify([catalogCacheKey, item.artifactVersion.id, itemRevision, purpose]);
+    const cached = wizardArtifactDetailCache.get(cacheKey);
+    if (useCache && cached && cached.expiresAt > Date.now()) {
+      return {
+        ok: true,
+        artifact: cached.artifact
+      };
+    }
+    const inflight = wizardArtifactDetailInflight.get(inflightKey);
+    if (useCache && inflight) {
+      const inflightResult = await inflight;
+      if (!inflightResult.ok) return inflightResult;
+      return {
+        ok: true,
+        artifact: inflightResult.artifact
+      };
+    }
+    const requestPromise = fetchWizardArtifactDetail({
+      worktree: input.worktree,
+      config,
+      resolution: workspaceResolution,
+      artifactKind,
+      artifactVersionId: item.artifactVersion.id,
+      signal,
+      onAuthStateChanged: clearPublishedSkillState,
+      purpose
+    });
+    wizardArtifactDetailInflight.set(inflightKey, requestPromise);
+    try {
+      const detailResult = await requestPromise;
+      if (!detailResult.ok) return detailResult;
+      wizardArtifactDetailCache.set(cacheKey, {
+        artifact: detailResult.artifact,
+        expiresAt: Date.now() + CACHE_TTL_MS,
+        revision: itemRevision
+      });
+      return {
+        ok: true,
+        artifact: detailResult.artifact
+      };
+    } finally {
+      wizardArtifactDetailInflight.delete(inflightKey);
+    }
+  };
   const executePublishedSkillsFetchTool = async ({
     args,
     context
@@ -520,13 +608,15 @@ export const OpencodeWizardSkillsPlugin = async input => {
           },
           fetchedAt: filteredPublishedSkillsResult.fetchResult.fetchedAt,
           source: filteredPublishedSkillsResult.fetchResult.source,
+          cacheCursor: getCatalogCursor(filteredPublishedSkillsResult.fetchResult.payload.skills, filteredPublishedSkillsResult.fetchResult.payload.catalogSkills),
           cacheTtlMs: CACHE_TTL_MS,
-          message: args.refresh ? 'Catalog discovery refreshed from the backend. Provide `skill` for one identifier or prefer `skills` for comma/newline-separated multiple identifiers to fetch markdown bodies/details.' : 'Catalog discovery only. Cached results expire automatically after 30 seconds, or pass `refresh: true` to force a backend refresh immediately. Provide `skill` for one identifier or prefer `skills` for comma/newline-separated multiple identifiers to fetch markdown bodies/details.'
+          message: args.refresh ? 'Catalog discovery refreshed from the backend. Provide `skill` for one identifier or prefer `skills` for comma/newline-separated multiple identifiers to fetch markdown bodies/details.' : 'Catalog discovery only. Cached results include deterministic revision cursors; pass `refresh: true` to force a backend refresh immediately. Provide `skill` for one identifier or prefer `skills` for comma/newline-separated multiple identifiers to fetch markdown bodies/details.'
         }, null, 2),
         metadata: {
           status: 'ready',
           ...toWorkspaceResolutionMetadata(filteredPublishedSkillsResult.workspaceResolution),
           source: filteredPublishedSkillsResult.fetchResult.source,
+          cacheCursor: getCatalogCursor(filteredPublishedSkillsResult.fetchResult.payload.skills, filteredPublishedSkillsResult.fetchResult.payload.catalogSkills),
           publishedSkillCount: catalog.publishedSkillCount.toString(),
           globalAssignmentCount: catalog.assignmentCounts.global.toString(),
           projectAssignmentCount: catalog.assignmentCounts.project.toString(),
@@ -696,6 +786,7 @@ export const OpencodeWizardSkillsPlugin = async input => {
         pluginId: PLUGIN_ID,
         availableTools: resolveAvailableTools(authState?.role ?? null)
       });
+      const cacheCursor = getWizardArtifactCatalogCursor(fetchResult.payload.artifacts, toWizardArtifactCatalogCursorItems(fetchResult.payload.catalogArtifacts));
       return {
         output: JSON.stringify({
           ...catalog,
@@ -704,14 +795,18 @@ export const OpencodeWizardSkillsPlugin = async input => {
           workspaceResolution: toWorkspaceResolutionOutput(workspaceResolution),
           fetchedAt: fetchResult.fetchedAt,
           source: fetchResult.source,
-          message: 'DESIGN_DOC catalog discovery only. Full DESIGN.md bodies/files require opencode_wizard_artifact_fetch with artifactKind DESIGN_DOC.'
+          cacheCursor,
+          cacheTtlMs: CACHE_TTL_MS,
+          message: 'Generic artifact catalog discovery only. Full bodies/files require opencode_wizard_artifact_fetch with artifactKind and artifact identifiers.'
         }, null, 2),
         metadata: {
           status: 'ready',
           artifactKind,
           artifactCount: catalog.artifactCount.toString(),
           ...toWorkspaceResolutionMetadata(workspaceResolution),
-          source: fetchResult.source
+          source: fetchResult.source,
+          cacheCursor,
+          cacheTtlMs: CACHE_TTL_MS.toString()
         }
       };
     }
@@ -775,6 +870,7 @@ export const OpencodeWizardSkillsPlugin = async input => {
           pluginId: PLUGIN_ID,
           availableTools: resolveAvailableTools(authState?.role ?? null)
         });
+        const cacheCursor = getWizardArtifactCatalogCursor(fetchResult.payload.artifacts, toWizardArtifactCatalogCursorItems(fetchResult.payload.catalogArtifacts));
         return {
           output: JSON.stringify({
             ...catalog,
@@ -783,11 +879,15 @@ export const OpencodeWizardSkillsPlugin = async input => {
             workspaceResolution: toWorkspaceResolutionOutput(workspaceResolution),
             fetchedAt: fetchResult.fetchedAt,
             source: fetchResult.source,
-            message: 'Provide artifact or artifacts to fetch DESIGN.md body/files.'
+            cacheCursor,
+            cacheTtlMs: CACHE_TTL_MS,
+            message: 'Provide artifact or artifacts to fetch artifact body/files.'
           }, null, 2),
           metadata: {
             status: 'ready',
             artifactKind,
+            cacheCursor,
+            cacheTtlMs: CACHE_TTL_MS.toString(),
             ...toWorkspaceResolutionMetadata(workspaceResolution)
           }
         };
@@ -811,15 +911,13 @@ export const OpencodeWizardSkillsPlugin = async input => {
           }
         };
       }
-      const detailResults = await Promise.all(selection.selectedItems.map(item => fetchWizardArtifactDetail({
-        worktree: input.worktree,
-        config,
-        resolution: workspaceResolution,
-        artifactKind,
-        artifactVersionId: item.artifactVersion.id,
+      const detailResults = await Promise.all(selection.selectedItems.map(item => loadWizardArtifactDetail({
+        workspaceResolution,
+        item,
         signal: context.abort,
-        onAuthStateChanged: clearPublishedSkillState,
-        purpose: 'TOOL_FETCH'
+        useCache: !args.refresh,
+        purpose: 'TOOL_FETCH',
+        artifactKind
       })));
       const failedDetail = detailResults.find(result => !result.ok);
       if (failedDetail && !failedDetail.ok) {
@@ -849,6 +947,7 @@ export const OpencodeWizardSkillsPlugin = async input => {
           artifactVersion: result.artifact
         });
       });
+      const cacheCursor = getWizardArtifactCatalogCursor(selection.selectedItems, toWizardArtifactCatalogCursorItems(fetchResult.payload.catalogArtifacts));
       return {
         output: JSON.stringify({
           pluginId: PLUGIN_ID,
@@ -859,6 +958,8 @@ export const OpencodeWizardSkillsPlugin = async input => {
           workspace: fetchResult.payload.workspace,
           fetchedAt: fetchResult.fetchedAt,
           source: fetchResult.source,
+          cacheCursor,
+          cacheTtlMs: CACHE_TTL_MS,
           requestedArtifacts,
           missingArtifacts: selection.missingIdentifiers,
           artifacts: details
@@ -867,6 +968,7 @@ export const OpencodeWizardSkillsPlugin = async input => {
           status: selection.missingIdentifiers.length > 0 ? 'partial' : 'ready',
           artifactKind,
           matchedCount: details.length.toString(),
+          cacheTtlMs: CACHE_TTL_MS.toString(),
           ...toWorkspaceResolutionMetadata(workspaceResolution)
         }
       };
@@ -1139,6 +1241,99 @@ export const OpencodeWizardSkillsPlugin = async input => {
     });
     return withWizardArtifactEnvelope(result, artifactKind);
   };
+  const executeEditorCreateOrUpdateSkillMarkdown = async ({
+    markdownContent,
+    context,
+    source,
+    requestedSkillSlug
+  }) => {
+    const authState = await resolveStoredAuthState(input.worktree, config);
+    if (!authState || authState.role !== 'EDITOR') {
+      return {
+        output: JSON.stringify({
+          pluginId: PLUGIN_ID,
+          status: 'forbidden',
+          skillSlug: requestedSkillSlug ?? null,
+          source,
+          message: 'This tool requires EDITOR role. Your current session does not have the required editor permission.'
+        }, null, 2),
+        metadata: {
+          status: 'forbidden',
+          role: authState?.role ?? 'none'
+        }
+      };
+    }
+    if (!markdownContent.trim()) {
+      throw new Error('Editor skill create/update requires non-empty markdownContent.');
+    }
+    const requestedDirectory = normalizeDirectoryArg(context.directory, undefined);
+    const directoryPath = normalizeRepositoryPath(workspacePath, requestedDirectory);
+    lastInteractiveDirectoryPath = directoryPath;
+    const response = await fetchPublishedSkillsGraphQl({
+      worktree: input.worktree,
+      config,
+      query: CREATE_OR_UPDATE_SKILL_FROM_MARKDOWN_MUTATION,
+      variables: {
+        markdownContent
+      },
+      signal: context.abort
+    });
+    if (!response.ok) {
+      return {
+        output: JSON.stringify({
+          pluginId: PLUGIN_ID,
+          status: 'request_failed',
+          skillSlug: requestedSkillSlug ?? null,
+          source,
+          message: response.result.message
+        }, null, 2),
+        metadata: {
+          status: 'request_failed',
+          skillSlug: requestedSkillSlug ?? '',
+          directoryPath
+        }
+      };
+    }
+    const payload = response.data.admin.createOrUpdateSkillFromMarkdown;
+    await scheduleInteractivePresenceStart();
+    return {
+      output: JSON.stringify({
+        pluginId: PLUGIN_ID,
+        status: payload.success ? 'created_or_updated' : 'create_or_update_failed',
+        source,
+        skillSlug: payload.skillSlug,
+        skillVersionId: payload.skillVersionId,
+        artifactSlug: payload.artifactSlug,
+        artifactVersionId: payload.artifactVersionId,
+        requestedDirectoryPath: directoryPath,
+        errors: payload.errors,
+        message: source === 'direct_markdown' ? 'Skill markdown was sent directly to the backend; no local seed file was required.' : 'Local seed SKILL.md was published through the backend skill markdown mutation.'
+      }, null, 2),
+      metadata: {
+        status: payload.success ? 'created_or_updated' : 'create_or_update_failed',
+        skillSlug: payload.skillSlug,
+        skillVersionId: payload.skillVersionId ?? '',
+        source,
+        directoryPath
+      }
+    };
+  };
+  const executeEditorCreateOrUpdateSkillTool = async ({
+    args,
+    context
+  }) => {
+    const requestedDirectory = normalizeDirectoryArg(context.directory, args.directory);
+    const directoryPath = normalizeRepositoryPath(workspacePath, requestedDirectory);
+    lastInteractiveDirectoryPath = directoryPath;
+    return executeEditorCreateOrUpdateSkillMarkdown({
+      markdownContent: args.markdownContent,
+      context: {
+        ...context,
+        directory: requestedDirectory
+      },
+      source: 'direct_markdown'
+    });
+  };
   const executeEditorPublishSkillTool = async ({
     args,
     context
@@ -1154,6 +1349,7 @@ export const OpencodeWizardSkillsPlugin = async input => {
           pluginId: PLUGIN_ID,
           status: 'forbidden',
           skillSlug: requestedSkillSlug,
+          source: 'seed_file',
           message: 'This tool requires EDITOR role. Your current session does not have the required editor permission.'
         }, null, 2),
         metadata: {
@@ -1191,47 +1387,15 @@ export const OpencodeWizardSkillsPlugin = async input => {
         }
       };
     }
-    const response = await fetchPublishedSkillsGraphQl({
-      worktree: input.worktree,
-      config,
-      query: CREATE_OR_UPDATE_SKILL_FROM_MARKDOWN_MUTATION,
-      variables: {
-        markdownContent
+    return executeEditorCreateOrUpdateSkillMarkdown({
+      markdownContent,
+      context: {
+        ...context,
+        directory: requestedDirectory
       },
-      signal: context.abort
+      source: 'seed_file',
+      requestedSkillSlug
     });
-    if (!response.ok) {
-      return {
-        output: JSON.stringify({
-          pluginId: PLUGIN_ID,
-          status: 'request_failed',
-          skillSlug: requestedSkillSlug,
-          message: response.result.message
-        }, null, 2),
-        metadata: {
-          status: 'request_failed',
-          skillSlug: requestedSkillSlug,
-          directoryPath
-        }
-      };
-    }
-    const payload = response.data.createOrUpdateSkillFromMarkdown;
-    await scheduleInteractivePresenceStart();
-    return {
-      output: JSON.stringify({
-        pluginId: PLUGIN_ID,
-        status: payload.success ? 'published' : 'publish_failed',
-        skillSlug: payload.skillSlug,
-        skillVersionId: payload.skillVersionId,
-        errors: payload.errors
-      }, null, 2),
-      metadata: {
-        status: payload.success ? 'published' : 'publish_failed',
-        skillSlug: payload.skillSlug,
-        skillVersionId: payload.skillVersionId ?? '',
-        directoryPath
-      }
-    };
   };
   const executeWizardArtifactImportTool = async ({
     args,
@@ -1348,8 +1512,6 @@ export const OpencodeWizardSkillsPlugin = async input => {
       }
     };
   };
-  const role = initialAuthState?.role ?? null;
-  const isEditor = role === 'EDITOR';
   const {
     sharedTools,
     editorOnlyTools
@@ -1378,6 +1540,10 @@ export const OpencodeWizardSkillsPlugin = async input => {
       args,
       context
     }),
+    createOrUpdateEditorSkill: (args, context) => executeEditorCreateOrUpdateSkillTool({
+      args,
+      context
+    }),
     publishEditorSkill: (args, context) => executeEditorPublishSkillTool({
       args,
       context
@@ -1388,10 +1554,10 @@ export const OpencodeWizardSkillsPlugin = async input => {
     })
   });
   return {
-    tool: {
+    tool: initialAuthState?.role === 'EDITOR' ? {
       ...sharedTools,
-      ...(isEditor ? editorOnlyTools : {})
-    },
+      ...editorOnlyTools
+    } : sharedTools,
     'experimental.chat.system.transform': async (_hookInput, output) => {
       let publishedSkillsResult = await loadPublishedSkillCatalog({
         directory: input.directory,