npm - ossclip - Versions diffs - 0.1.24 → 0.1.26 - Mend

ossclip 0.1.24 → 0.1.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/editor-dist/assets/index-Bx2VQLP8.css +1 -0
package/editor-dist/assets/index-DVI51_2u.js +163 -0
package/editor-dist/index.html +2 -2
package/package.json +4 -4
package/src/analyze.ts +17 -1
package/src/caption-report.ts +141 -3
package/src/doctor.ts +7 -5
package/src/edit.ts +571 -3
package/src/interactive/ask-input.ts +11 -3
package/src/interactive/pick-save-path.ts +214 -0
package/src/interactive/produce-argv.ts +39 -2
package/src/interactive/produce-wizard.ts +236 -35
package/src/interactive/thumbnail-approve.ts +217 -0
package/src/open.ts +64 -8
package/src/paths.ts +88 -0
package/src/portrait-override.ts +86 -0
package/src/produce.ts +1971 -161
package/src/program.ts +142 -6
package/src/replay-argv.ts +75 -0
package/src/setup/manifest.ts +93 -4
package/src/setup/plan.ts +17 -6
package/src/setup/setup.ts +28 -7
package/src/thumbnail-panel.ts +167 -0
package/src/ui/animation.ts +10 -0
package/editor-dist/assets/index-ChRVBVLj.css +0 -1
package/editor-dist/assets/index-MLGz89mM.js +0 -163

package/editor-dist/index.html CHANGED Viewed

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ossclip editor</title>
-    <script type="module" crossorigin src="/assets/index-MLGz89mM.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-ChRVBVLj.css">
+    <script type="module" crossorigin src="/assets/index-DVI51_2u.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Bx2VQLP8.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ossclip",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "Local-first CLI video producer: cuts silence and fillers, word-timed captions, face-aware framing, and LLM-planned code-rendered graphics — transcription and rendering never leave your machine",
   "type": "module",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "commander": "^12.1.0",
     "tsx": "^4.19.0",
     "zod": "^3.25.76",
-    "@ossclip/core": "0.1.24",
-    "@ossclip/scenes": "0.1.24",
-    "@ossclip/renderer": "0.1.24"
+    "@ossclip/renderer": "0.1.26",
+    "@ossclip/core": "0.1.26",
+    "@ossclip/scenes": "0.1.26"
   },
   "homepage": "https://github.com/AhsanAyaz/ossclip#readme",
   "bugs": {

package/src/analyze.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import {
   keptPauses,
   type CleanupLevel,
 } from "@ossclip/core";
+import { expandHome } from "./paths";
 import { produce } from "./produce";
 import type { PhaseTimings } from "./phase-timing";
@@ -93,6 +94,13 @@ export const RenderPropsExportSchema = z.object({
   // Written only when the camera is OFF (produce's absent-means-default
   // contract) — absent must read as "motion on".
   staticCamera: z.boolean().optional(),
+  // The face-only jump-cut plan (2026-08-16, Task 6). Absent means the
+  // LEGACY 1.07-everywhere punch — every pre-feature workdir exports the
+  // camera its render had. A present-but-mangled plan ERRORS here rather
+  // than falling back: unlike the renderer (which can only degrade
+  // gracefully mid-frame, punchPropsFor → legacy), this export can refuse
+  // with a field name, the posture the schema's own doc comment demands.
+  punch: z.object({ scale: z.number(), allowed: z.array(z.boolean()) }).optional(),
 });
 /** Same shape as produce's `defaultOutPath`: beside the input, new extension. */
@@ -160,7 +168,14 @@ export async function runAnalyze(
   );
   const markerCount = (production.cutlist ?? []).filter((s) => s.kind === "remove").length;
   const pauseCount = keptPauses(production).length;
-  const outPath = resolve(opts.out ?? defaultExportPath(resolve(inputArg), opts.format));
+  // expandHome on both user-typed halves (2026-08-16 rule, paths.ts): a
+  // `~/` --out or input must not resolve against cwd. produce() expands the
+  // input it received on its own; this line's derivations are separate reads.
+  const outPath = resolve(
+    opts.out !== undefined
+      ? expandHome(opts.out)
+      : defaultExportPath(resolve(expandHome(inputArg)), opts.format),
+  );
   if (opts.format === "premiere-project") {
     // The project export reads render-props.json, not just production.json:
@@ -176,6 +191,7 @@ export async function runAnalyze(
       captionLines: props.captionLines,
       zoomPlan: props.zoomPlan,
       staticCamera: props.staticCamera,
+      punch: props.punch,
       // The OUTPUT frame — production.render already carries --aspect.
       frame: { width: production.render.width, height: production.render.height },
     });

package/src/caption-report.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import {
   applyCaptionEdits,
+  applyCaptionRangeEdits,
+  applyCaptionWordHides,
+  applyCaptionLineTiming,
   captionEditsToKeep,
   isLegacyCaptionKey,
   migrateCaptionKeys,
@@ -65,6 +68,95 @@ export function captionDropLine(drop: AppliedCaptionEdits["dropped"][number]): s
   );
 }
+/**
+ * One console line for a HIDE that did not land (§59b, revisited 2026-08-18).
+ * Same three cases as `captionDropLine` — `applyCaptionWordHides` reports in
+ * the identical shape — but its own function rather than a flag on that one:
+ * "hidden word" has to lead every sentence (the user's gesture was a delete,
+ * not a retype, and the fix is to re-select and hide, not to retype), and no
+ * legacy-key branch exists here because `captionWordsHidden` never had a
+ * positional-key era (`OverrideDocSchema`'s own note).
+ */
+export function captionHideDropLine(drop: AppliedCaptionEdits["dropped"][number]): string {
+  if (drop.reason === "duplicate-anchor") {
+    // A note about reach, not a failure — the hide applied, to the FIRST word
+    // carrying this anchor (two words share one source instant by design,
+    // captions.ts:44-50).
+    return (
+      `  ⚠ hidden word "${drop.expected}" (${drop.key}): a second word shares that ` +
+      `source moment and was left visible — only the first was hidden`
+    );
+  }
+  if (drop.found === null) {
+    return (
+      `  ⚠ hidden word "${drop.expected}" (${drop.key}) dropped: no word starts at that ` +
+      `source moment any more — the cut removed the word it hid, so there is ` +
+      `nothing left to hide`
+    );
+  }
+  return (
+    `  ⚠ hidden word "${drop.expected}" (${drop.key}) dropped: the transcript now says ` +
+    `"${drop.found}" there — it was left visible rather than hiding a different word`
+  );
+}
+/**
+ * One console line for a RANGE rewrite that did not land (2026-08-18). Its
+ * own function for the captionHideDropLine reason: the gesture was a
+ * free-text rewrite and the fix is to re-select and Edit; `expected` is the
+ * WHOLE run's joined `was` (the layer's whole-run guard drops the entire
+ * entry rather than guessing at part of it), and `key` is the composite
+ * `${fromKey}..${toKey}` pair. No legacy-key branch: `captionRangeEdits`
+ * postdates §137, so a positional-key era never existed for it.
+ */
+export function captionRangeDropLine(drop: AppliedCaptionEdits["dropped"][number]): string {
+  if (drop.reason === "duplicate-anchor") {
+    return (
+      `  ⚠ range edit "${drop.expected}" (${drop.key}): an earlier range edit already ` +
+      `rewrote the word it starts on — only the first applied`
+    );
+  }
+  if (drop.found === null) {
+    return (
+      `  ⚠ range edit "${drop.expected}" (${drop.key}) dropped: its words no longer sit at ` +
+      `those source moments — a cut or re-plan removed the run it rewrote. Re-select and ` +
+      `Edit in the editor if you still want it.`
+    );
+  }
+  return (
+    `  ⚠ range edit "${drop.expected}" (${drop.key}) dropped: the transcript now says ` +
+    `"${drop.found}" there — the whole rewrite was left unapplied rather than guessing at part of it`
+  );
+}
+/**
+ * One console line for a LINE TIMING nudge that did not land (2026-08-18).
+ * Its own function for the captionHideDropLine reason: the gesture was a
+ * re-time of when a caption appears and the fix is to re-make the nudge, not
+ * retype. Only TWO cases — `applyCaptionLineTiming` carries no `was` guard
+ * (timing is text-orthogonal, its own doc comment), so the "transcript says
+ * something else" sentence has no counterpart here, and `expected` is always
+ * `""`, which is why these lines name the moment by key rather than quoting a
+ * word. The key is the LINE's first word's source anchor, so the sentences
+ * say "caption timing", not "word". No legacy-key branch:
+ * `captionLineTiming` postdates §137.
+ */
+export function captionTimingDropLine(drop: AppliedCaptionEdits["dropped"][number]): string {
+  if (drop.reason === "duplicate-anchor") {
+    // A note about reach, not a failure — the nudge applied, to the FIRST
+    // line starting on this anchor (two words share one source instant by
+    // design, captions.ts:44-50).
+    return (
+      `  ⚠ caption timing (${drop.key}): a second caption starts on that source moment and ` +
+      `kept its window — only the first was re-timed`
+    );
+  }
+  return (
+    `  ⚠ caption timing (${drop.key}) dropped: no caption starts at that source moment any ` +
+    `more — the cut removed the caption whose timing was nudged`
+  );
+}
 /**
  * How many stored edits actually landed.
  *
@@ -79,9 +171,14 @@ export function captionDropLine(drop: AppliedCaptionEdits["dropped"][number]): s
  * marked `seen` by the first word carrying it, and that word either applied
  * the edit or was reported with `reason` ABSENT. So an edit landed exactly
  * when nothing was reported for its key without a `reason`.
+ *
+ * `applyCaptionWordHides` and `applyCaptionLineTiming` are built to the same
+ * contract (first claimant applies, extras get `duplicate-anchor`, unmatched
+ * keys get a reason-less drop), so this counts for those layers too — hence
+ * the record's value type is unconstrained: only the KEYS are read.
  */
 export function appliedCaptionEditCount(
-  edits: Record<string, CaptionEdit>,
+  edits: Readonly<Record<string, unknown>>,
   dropped: AppliedCaptionEdits["dropped"],
 ): number {
   const failed = new Set(dropped.filter((d) => d.reason === undefined).map((d) => d.key));
@@ -143,7 +240,9 @@ export function reanchoredKeyCount(
 export interface CaptionReconciliation {
   /** The doc with its caption keys upgraded — what produce writes back. */
   doc: OverrideDoc;
-  /** The caption lines with every edit that could be applied, applied. */
+  /** The caption lines with every edit, range rewrite, hide AND line-timing
+   * nudge that could apply, applied — post-timing, exactly what the render
+   * should show. */
   lines: CaptionLine[];
   /**
    * Whether the migration actually MOVED an edit onto a source anchor — the
@@ -213,5 +312,44 @@ export function reconcileCaptionEdits(
   const live = appliedCaptionEditCount(migration.edits, dropped);
   if (live > 0) log.push(`▸ ${live} caption word(s) retyped by the editor`);
   for (const d of dropped) log.push(captionDropLine(d));
-  return { doc: migrated, lines, reanchored: reanchored > 0, log };
+  // Range rewrites BETWEEN retypes and hides — `applyCaptionLayers`' one
+  // authoritative order, still composed manually here because this path's
+  // edits layer is the MIGRATED set (see the hides comment below). No key
+  // migration for ranges either: `captionRangeEdits` postdates §137, and the
+  // write-back above spreads it through untouched. The applied count is a
+  // plain subtraction — unlike the per-word layers, `applyCaptionRangeEdits`
+  // reports each entry at most once (its own doc comment), so the
+  // `appliedCaptionEditCount` machinery is not needed.
+  const ranges = applyCaptionRangeEdits(lines, doc.captionRangeEdits);
+  const rewritten = doc.captionRangeEdits.length - ranges.dropped.length;
+  if (rewritten > 0) log.push(`▸ ${rewritten} caption range(s) rewritten by the editor`);
+  for (const d of ranges.dropped) log.push(captionRangeDropLine(d));
+  // Hides AFTER retypes and range rewrites — `applyCaptionLayers`' one
+  // authoritative order (a hide's `was` is the LIVE post-retype text),
+  // composed manually here rather than through the composer because this
+  // path's edits layer is the MIGRATED set, not `doc.captions` — the
+  // composer takes a doc whole and would re-apply the unresolved legacy keys
+  // the migration just set aside. No key migration for hides:
+  // `captionWordsHidden` never had a positional-key era (`OverrideDocSchema`'s
+  // own note), and the write-back above spreads it through untouched.
+  const hides = applyCaptionWordHides(ranges.lines, doc.captionWordsHidden);
+  for (const d of hides.dropped) log.push(captionHideDropLine(d));
+  // LINE timing LAST — `applyCaptionLayers`' one authoritative order: nudges
+  // move the seams between SURVIVING lines, so they run on the post-hide
+  // lines. No key migration here either: `captionLineTiming` postdates §137,
+  // and the write-back above spreads it through untouched.
+  //
+  // Counted with `appliedCaptionEditCount`, NOT by subtracting drops (§137's
+  // lesson, re-learned in the 2026-08-19 review): `applyCaptionLineTiming`
+  // pushes a `duplicate-anchor` drop per EXTRA line claiming the anchor
+  // (overrides.ts), so one key with two claimants subtracted to `1 - 1 = 0`
+  // and with three to `-1` — and the `> 0` gate below then erased the line
+  // ENTIRELY for a nudge that had in fact applied to its first claimant. The
+  // range layer's plain subtraction stays, because that layer reports each
+  // entry at most once; this one does not.
+  const timed = applyCaptionLineTiming(hides.lines, doc.captionLineTiming);
+  const nudged = appliedCaptionEditCount(doc.captionLineTiming, timed.dropped);
+  if (nudged > 0) log.push(`▸ ${nudged} caption timing nudge(s) applied`);
+  for (const d of timed.dropped) log.push(captionTimingDropLine(d));
+  return { doc: migrated, lines: timed.lines, reanchored: reanchored > 0, log };
 }

package/src/doctor.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
-import { isAbsolute, join } from "node:path";
 import type { OssclipConfig } from "@ossclip/core";
+import { modelUrl, validModelSources, whisperModelPath } from "./setup/manifest";
 /**
  * `ossclip doctor` (R18 §90a): check every prerequisite and print the exact
@@ -126,9 +126,11 @@ export async function runDoctor(cfg: OssclipConfig, p: DoctorProbes): Promise<Do
         }),
   });
-  // Same resolution `produce` uses: an absolute model is a file path, a bare
-  // name resolves inside modelDir as ggml-<name>.bin.
-  const modelPath = isAbsolute(cfg.model) ? cfg.model : join(cfg.modelDir, `ggml-${cfg.model}.bin`);
+  // Same resolution `produce` uses (whisperModelPath — one rule, three
+  // sites), and the same URL source: the fix line used to hold its own copy
+  // of the ggerganov URL, which 404'd for curated/custom names and the
+  // `curl -L` then saved the 404 HTML as a fake model.
+  const modelPath = whisperModelPath(cfg.model, cfg.modelDir);
   const modelOk = p.exists(modelPath);
   checks.push({
     name: `whisper model (${cfg.model})`,
@@ -139,7 +141,7 @@ export async function runDoctor(cfg: OssclipConfig, p: DoctorProbes): Promise<Do
       : {
           fix: viaSetup(
             `mkdir -p ${cfg.modelDir} && curl -L -o ${modelPath} ` +
-              `https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-${cfg.model}.bin`,
+              modelUrl(cfg.model, validModelSources(cfg.modelSources)),
           ),
         }),
   });