@deskwork/studio 0.16.0 → 0.17.0

package/dist/lib/entry-resolver.d.ts

@@ -3,13 +3,26 @@
  * handlers use this when they need both metadata (from the sidecar) and
  * the live document content (from the markdown artifact on disk).
  *
- * The artifact path depends on stage: scrapbook docs (idea/plan/outline)
- * for early stages, the canonical `index.md` for Drafting / Final /
- * Published. Off-pipeline stages (Blocked / Cancelled) carry their
- * priorStage so the resolver can locate the artifact even when the
- * entry is paused.
+ * Issue #222 (Option B + hybrid refinement) — `index.md` is always
+ * "the document under review" for index.md-canonical entries. The
+ * studio renders `index.md` regardless of `currentStage`. Per-stage
+ * scrapbook files are frozen snapshots produced by `approveEntryStage`.
  *
- * Pipeline-redesign Task 33 — Phase 6 entry resolver.
+ * Resolution order (T1 + non-index.md fallback):
+ *   1. If the sidecar carries an `artifactPath`:
+ *      a. Prefer `<dirname(artifactPath)>/index.md` IF it exists on disk
+ *         (T1's index.md-canonical case).
+ *      b. Otherwise fall back to `artifactPath` itself. Supports
+ *         shared-directory layouts (multiple entries per directory,
+ *         each addressed by its own filename) — e.g. deskwork's own
+ *         feature-doc layout where prd.md / workplan.md / README.md
+ *         share a directory.
+ *   2. No artifactPath: try `<contentDir>/<slug>/index.md` (pre-#140
+ *      entries that the doctor migration hasn't processed yet).
+ *
+ * Pre-T1 the resolver routed by stage (Ideas → idea.md, Planned →
+ * plan.md, Outlining → outline.md, Drafting/Final/Published →
+ * index.md). That routing has been retired — see Issue #222.
  */
 import type { Entry } from '@deskwork/core/schema/entry';
 interface ResolveResult {

package/dist/lib/entry-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entry-resolver.d.ts","sourceRoot":"","sources":["../../src/lib/entry-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,KAAK,EAAE,KAAK,EAAS,MAAM,6BAA6B,CAAC;AAEhE,UAAU,aAAa;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAaD,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAoB5F"}
+{"version":3,"file":"entry-resolver.d.ts","sourceRoot":"","sources":["../../src/lib/entry-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAOH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,UAAU,aAAa;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAqBD,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAK5F"}

package/dist/lib/entry-resolver.js

@@ -3,46 +3,53 @@
  * handlers use this when they need both metadata (from the sidecar) and
  * the live document content (from the markdown artifact on disk).
  *
- * The artifact path depends on stage: scrapbook docs (idea/plan/outline)
- * for early stages, the canonical `index.md` for Drafting / Final /
- * Published. Off-pipeline stages (Blocked / Cancelled) carry their
- * priorStage so the resolver can locate the artifact even when the
- * entry is paused.
+ * Issue #222 (Option B + hybrid refinement) — `index.md` is always
+ * "the document under review" for index.md-canonical entries. The
+ * studio renders `index.md` regardless of `currentStage`. Per-stage
+ * scrapbook files are frozen snapshots produced by `approveEntryStage`.
  *
- * Pipeline-redesign Task 33 — Phase 6 entry resolver.
+ * Resolution order (T1 + non-index.md fallback):
+ *   1. If the sidecar carries an `artifactPath`:
+ *      a. Prefer `<dirname(artifactPath)>/index.md` IF it exists on disk
+ *         (T1's index.md-canonical case).
+ *      b. Otherwise fall back to `artifactPath` itself. Supports
+ *         shared-directory layouts (multiple entries per directory,
+ *         each addressed by its own filename) — e.g. deskwork's own
+ *         feature-doc layout where prd.md / workplan.md / README.md
+ *         share a directory.
+ *   2. No artifactPath: try `<contentDir>/<slug>/index.md` (pre-#140
+ *      entries that the doctor migration hasn't processed yet).
+ *
+ * Pre-T1 the resolver routed by stage (Ideas → idea.md, Planned →
+ * plan.md, Outlining → outline.md, Drafting/Final/Published →
+ * index.md). That routing has been retired — see Issue #222.
  */
 import { readFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { existsSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
 import { readSidecar } from '@deskwork/core/sidecar';
 import { getContentDir } from '@deskwork/core/config';
-const STAGE_ARTIFACT = {
-    Ideas: (s, d) => join(d, s, 'scrapbook', 'idea.md'),
-    Planned: (s, d) => join(d, s, 'scrapbook', 'plan.md'),
-    Outlining: (s, d) => join(d, s, 'scrapbook', 'outline.md'),
-    Drafting: (s, d) => join(d, s, 'index.md'),
-    Final: (s, d) => join(d, s, 'index.md'),
-    Published: (s, d) => join(d, s, 'index.md'),
-    Blocked: null,
-    Cancelled: null,
-};
-export async function resolveEntry(projectRoot, uuid) {
-    const entry = await readSidecar(projectRoot, uuid);
-    // #140: prefer the explicit artifactPath when set; fall back to the
-    // slug+stage heuristic only for entries that don't have one (entries
-    // created pre-#140 fix and not yet doctor-repaired).
-    let artifactPath;
+function resolveIndexPath(projectRoot, entry) {
     if (entry.artifactPath) {
-        artifactPath = join(projectRoot, entry.artifactPath);
-    }
-    else {
-        const stage = entry.priorStage ?? entry.currentStage;
-        const pathFn = STAGE_ARTIFACT[stage];
-        if (pathFn === null) {
-            throw new Error(`No artifact path for stage ${stage}`);
-        }
-        const contentDir = getContentDir(projectRoot);
-        artifactPath = pathFn(entry.slug, contentDir);
+        const absArtifact = join(projectRoot, entry.artifactPath);
+        // Strip the scrapbook segment for legacy `<dir>/scrapbook/<file>.md`
+        // shapes; otherwise dirname(absArtifact) IS the doc dir.
+        const dir = basename(dirname(absArtifact)) === 'scrapbook'
+            ? dirname(dirname(absArtifact))
+            : dirname(absArtifact);
+        const indexPath = join(dir, 'index.md');
+        // T1's index.md-canonical preference: only if it actually exists.
+        // Otherwise fall back to artifactPath (shared-directory layouts).
+        if (existsSync(indexPath))
+            return indexPath;
+        return absArtifact;
     }
+    const contentDir = getContentDir(projectRoot);
+    return join(contentDir, entry.slug, 'index.md');
+}
+export async function resolveEntry(projectRoot, uuid) {
+    const entry = await readSidecar(projectRoot, uuid);
+    const artifactPath = resolveIndexPath(projectRoot, entry);
     const artifactBody = await readFile(artifactPath, 'utf8');
     return { entry, artifactBody, artifactPath };
 }

package/dist/lib/entry-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"entry-resolver.js","sourceRoot":"","sources":["../../src/lib/entry-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAStD,MAAM,cAAc,GAAyE;IAC3F,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC;IACnD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC;IACrD,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC;IAC1D,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC;IAC1C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC;IAC3C,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAY;IAClE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAEnD,oEAAoE;IACpE,qEAAqE;IACrE,qDAAqD;IACrD,IAAI,YAAoB,CAAC;IACzB,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,YAAY,CAAC;QACrD,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9C,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"entry-resolver.js","sourceRoot":"","sources":["../../src/lib/entry-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAStD,SAAS,gBAAgB,CAAC,WAAmB,EAAE,KAAY;IACzD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1D,qEAAqE;QACrE,yDAAyD;QACzD,MAAM,GAAG,GACP,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,WAAW;YAC5C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC/B,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxC,kEAAkE;QAClE,kEAAkE;QAClE,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAY;IAClE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AAC/C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deskwork/studio",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "type": "module",
   "description": "Editorial review studio — local web UI for the deskwork plugin",
   "homepage": "https://github.com/audiocontrol-org/deskwork#readme",
@@ -46,7 +46,7 @@
     "@codemirror/language": "^6.12.3",
     "@codemirror/state": "^6.6.0",
     "@codemirror/view": "^6.41.1",
-    "@deskwork/core": "0.16.0",
+    "@deskwork/core": "0.17.0",
     "@hono/node-server": "^1.13.7",
     "@lezer/highlight": "^1.2.3",
     "esbuild": "^0.28.0",