@hypit/hypit 0.1.4 → 0.1.6

package/packages/cli/src/output.ts

@@ -60,7 +60,7 @@ export type AuthorCheckOutput = {
   readonly assets: number;
   readonly modules: number;
   readonly outputCount: number;
-  readonly outputs: readonly {
+  readonly outputs?: readonly {
     readonly name: string;
     readonly type: string;
   }[];
@@ -82,6 +82,7 @@ export type RunCheckOutput = {
   readonly targets: readonly string[];
   readonly candidates: number;
   readonly satisfactions: number;
+  readonly historicalOutputCount?: number;
   readonly steps?: number;
   readonly unresolvedHistoricalOutputs?: readonly {
     readonly candidate: string;
@@ -94,7 +95,7 @@ export type RunCheckOutput = {
 export type PlanPreflight = {
   readonly ok: boolean;
   readonly capabilityCount: number;
-  readonly capabilities: readonly string[];
+  readonly capabilities?: readonly string[];
   readonly omittedCapabilities?: number;
   readonly diagnosticCount: number;
   readonly diagnostics: readonly CliDiagnostic[];
@@ -119,7 +120,7 @@ export type PlanOutput = {
   readonly run: string;
   readonly targetCount: number;
   readonly targets: readonly string[];
-  readonly steps: number;
+  readonly steps?: number;
   readonly requestCount: number;
   readonly requestIssueCount: number;
   /** Present when a Runtime Profile was selected. */
@@ -128,19 +129,45 @@ export type PlanOutput = {
   readonly unresolvedRequestCount?: number;
   readonly unsupportedRequestCount?: number;
   readonly choiceCount: number;
-  readonly choices: readonly { readonly output: string; readonly candidate: string }[];
+  readonly choices?: readonly { readonly output: string; readonly candidate: string }[];
   readonly omittedChoices?: number;
   readonly unreached?: readonly { readonly output: string; readonly operation: string }[];
   readonly omittedUnreached?: number;
   /** Present only when a Runtime Profile was selected; the Endpoint and price page behind each capability. */
   readonly providers?: readonly PlanProvider[];
-  readonly omittedProviders?: number;
   /** Every external request the Build will make, in step order, with its parameters when known. */
   readonly needs?: readonly PlanNeed[];
-  readonly omittedNeeds?: number;
   readonly preflight?: PlanPreflight;
 };
 
+/** Output scope is independent of encoding. Limits apply to expanded detail, not demanded work. */
+export function createPlanOutput(plan: PlanOutput, options: { readonly verbose: boolean; readonly limit: number }): PlanOutput {
+  const { steps, choices = [], unreached = [], preflight, ...summary } = plan;
+  const limit = options.limit;
+  return {
+    ...summary,
+    ...(options.verbose ? {
+      steps,
+      choices: choices.slice(0, limit),
+      ...(choices.length <= limit ? {} : { omittedChoices: choices.length - limit }),
+      unreached: unreached.slice(0, limit),
+      ...(unreached.length <= limit ? {} : { omittedUnreached: unreached.length - limit }),
+    } : {}),
+    ...(preflight === undefined ? {} : { preflight: {
+      ok: preflight.ok,
+      capabilityCount: preflight.capabilityCount,
+      diagnosticCount: preflight.diagnosticCount,
+      diagnostics: preflight.diagnostics,
+      ...(options.verbose ? {
+        capabilities: preflight.capabilities?.slice(0, limit) ?? [],
+        ...((preflight.capabilities?.length ?? 0) <= limit ? {} : {
+          omittedCapabilities: preflight.capabilities!.length - limit,
+        }),
+      } : {}),
+    } }),
+  };
+}
+
 export type PricingEntry = PlanProvider & {
   readonly pricingDocuments?: readonly PricingDocument[];
   readonly pricingError?: string;
@@ -310,7 +337,7 @@ function renderAuthorCheck(
   verbose: boolean,
 ): string {
   const lines = [heading("success", "Source is valid", io, colors), ""];
-  const readable = view.machine.outputs;
+  const readable = view.machine.outputs ?? [];
   lines.push(...facts([
     ["Source", shortPath(view.machine.source)],
     ["Outputs", String(view.machine.outputCount)],
@@ -350,8 +377,7 @@ function renderRunCheck(
   verbose: boolean,
 ): string {
   const lines = [heading("success", "Run source is valid", io, colors), ""];
-  const reuse = (view.machine.unresolvedHistoricalOutputs?.length ?? 0)
-    + (view.machine.omittedHistoricalOutputs ?? 0);
+  const reuse = view.machine.historicalOutputCount ?? 0;
   const targetSummary = view.machine.targets.length === 0
     ? String(view.machine.targetCount)
     : view.machine.targets.join(", ")
@@ -433,7 +459,7 @@ function needSummaryText(needs: readonly PlanNeed[]): string {
   const pendingCount = first.pending.length;
   if (pendingCount > 0) parts.push(`${pendingCount === 1 ? "input" : `${pendingCount} inputs`} produced during Build`);
   if (first.issue !== undefined) parts.push(`could not inspect: ${first.issue}`);
-  return parts.length === 0 ? "no parameters" : parts.join(" · ");
+  return parts.length === 0 ? "request summary unavailable" : parts.join(" · ");
 }
 
 /** One line per distinct request shape, counted; the step names when only one request has that shape. */
@@ -489,6 +515,7 @@ function renderPlan(
     ["Run", shortPath(view.machine.run)],
     ["Targets", targetSummary],
     ["Requests", String(view.machine.requestCount)],
+    ...(view.machine.choiceCount === 0 ? [] : [["Run choices", String(view.machine.choiceCount)] as const]),
     ...(view.machine.requestIssueCount === 0 ? [] : [["Request issues", String(view.machine.requestIssueCount)] as const]),
     ...((view.machine.providerRequestCount ?? 0) === 0 ? [] : [["Provider requests", String(view.machine.providerRequestCount)] as const]),
     ...((view.machine.localRequestCount ?? 0) === 0 ? [] : [["Local requests", String(view.machine.localRequestCount)] as const]),
@@ -497,7 +524,7 @@ function renderPlan(
     ...(view.machine.preflight === undefined ? [] : [[
       "Preflight", view.machine.preflight.ok ? "ready" : "needs attention",
     ] as const]),
-    ...(verbose ? [["Steps", String(view.machine.steps)] as const] : []),
+    ...(!verbose || view.machine.steps === undefined ? [] : [["Steps", String(view.machine.steps)] as const]),
   ], colors));
   if (view.machine.providers !== undefined) {
     if (view.machine.providers.length > 0) lines.push("", colors.strong("Providers and price pages"));
@@ -531,9 +558,6 @@ function renderPlan(
       const requests = new Set(group.map((provider) => provider.request));
       lines.push(...groupedNeedLines((view.machine.needs ?? []).filter((need) => requests.has(need.request)), colors, verbose));
     }
-    if ((view.machine.omittedProviders ?? 0) > 0) {
-      lines.push(`  ${colors.dim(`${view.machine.omittedProviders} more requests · use --limit <count>`)}`);
-    }
   } else if (view.machine.requestCount > 0) {
     const byCapability = new Map<string, PlanNeed[]>();
     for (const need of view.machine.needs ?? []) {
@@ -559,9 +583,9 @@ function renderPlan(
   }
   if (view.machine.preflight !== undefined
     && (view.machine.preflight.diagnostics.length > 0
-      || (verbose && view.machine.preflight.capabilities.length > 0))) {
+      || (verbose && (view.machine.preflight.capabilities?.length ?? 0) > 0))) {
     lines.push("", colors.strong("Runtime preflight"));
-    if (verbose) for (const capability of view.machine.preflight.capabilities) lines.push(`  ${colors.accent(capability)}`);
+    if (verbose) for (const capability of view.machine.preflight.capabilities ?? []) lines.push(`  ${colors.accent(capability)}`);
     if (verbose && (view.machine.preflight.omittedCapabilities ?? 0) > 0) {
       lines.push(`  ${colors.dim(`${view.machine.preflight.omittedCapabilities} more capabilities · use --limit <count>`)}`);
     }
@@ -578,9 +602,9 @@ function renderPlan(
       lines.push(`  ${colors.dim(`${capabilityCount} demanded Endpoint ${capabilityCount === 1 ? "capability" : "capabilities"} checked.`)}`);
     }
   }
-  if (view.machine.choices.length > 0) {
+  if (verbose && (view.machine.choices?.length ?? 0) > 0) {
     lines.push("", colors.strong("Run choices"));
-    for (const selection of view.machine.choices) {
+    for (const selection of view.machine.choices ?? []) {
       const status = colors.success(glyph(io, "✓", "+"));
       lines.push(`  ${status} ${colors.accent(selection.output)} ← ${selection.candidate}`);
     }
@@ -774,23 +798,27 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       colors.dim("Validate one self-described Author Source or Run Source without executing it."),
       "",
       "  hypit check <source> [--workspace <workspace>] [--asset-root <directory>]",
+      "  --verbose lists exported names/types and historical references.",
     ],
     doctor: [
       colors.accent(colors.strong("hypit doctor")),
       colors.dim("Diagnose project Results and, when selected or supplied, one Runtime Profile."),
       "",
-      "  hypit doctor [--runtime <profile>] [--workspace <project>]",
+      "  hypit doctor [--runtime <profile>] [--workspace <project>] [--endpoint <instance>]",
       "  A positional Profile is also accepted in place of --runtime.",
+      "  Repeat --endpoint <instance> to limit the operation to chosen services; omission covers the Profile.",
       "  Without a Runtime Profile, checks only the project's selected Result Store.",
     ],
     plan: [
       colors.accent(colors.strong("hypit plan")),
-      colors.dim("Freeze the demanded subgraph and expose explicit Run choices and every external Need."),
+      colors.dim("Show targets, demanded requests and their readiness without executing them."),
       "",
       "  hypit plan <run-source> [--runtime <profile>] [--workspace <workspace>] [--asset-root <directory>]",
       "",
       "With --runtime, plan also preflights only the demanded deployment slice and names the Provider",
       "and price page behind each external request.",
+      "--verbose expands Run choices and unreached declarations. --limit bounds that detail,",
+      "while all demanded requests and diagnostics remain visible in both text and JSON.",
       "Planning never starts external work.",
     ],
     pricing: [
@@ -823,13 +851,14 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       "  hypit runtime init [<profile>] [--workspace <project>] create and select a starter Profile",
       "  hypit runtime use <profile> [--workspace <project>]  select the project Profile",
       "  hypit runtime unset [--workspace <project>]          remove only that selection",
-      "  hypit runtime up [<profile>]      prepare local packages and programs, then start the Worker",
+      "  hypit runtime up [<profile>] [--endpoint <instance>]  prepare helpers, then start the Worker",
       "  hypit runtime status [<profile>]  inspect the local Worker, active Builds and programs",
       "  hypit runtime logs [<profile>] [--lines <count>]",
       "  hypit runtime down [<profile>]    stop the Worker; external programs keep running",
       "",
       "The project is resolved first. Selection is read only from that project's .hypit/runtime.",
       "All runtime actions accept --workspace <project>; operational actions also accept --runtime <profile>.",
+      "For up, repeat --endpoint <instance> to prepare only chosen services; omission prepares the Profile.",
       "No Profile filename discovery or parent-project inheritance is performed.",
       "Remote Endpoints such as HypiHub are not started by this command; use doctor to test them.",
     ],
@@ -841,7 +870,8 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       "  hypit packages install <package@exact-version>",
       "",
       "The package is reused by every project and later session on this machine.",
-      "npm owns the ordinary package.json; Hypit creates no package lock or receipt.",
+      "Each exact version has its own installation; npm owns package.json and package-lock.json.",
+      "Preparation reports its install.log for live output and later diagnosis.",
     ],
     programs: [
       colors.accent(colors.strong("hypit programs")),
@@ -851,6 +881,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       "  hypit programs status [--runtime <profile>] [--workspace <project>]",
       "  hypit programs down [--runtime <profile>] [--workspace <project>]",
       "  A positional Profile is also accepted in place of --runtime.",
+      "  Repeat --endpoint <instance> to limit the operation to chosen services; omission covers the Profile.",
     ],
     activity: [
       colors.accent(colors.strong("hypit activity")),
@@ -874,6 +905,14 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       "",
       "  hypit builds [--workspace <project>] [--limit <count>] [--before <build-id>]",
     ],
+    logs: [
+      colors.accent(colors.strong("hypit logs")),
+      colors.dim("Read Build execution evidence; finished logs need only the project Result Repository."),
+      "",
+      "  hypit logs <build-id> [--workspace <project>] [--runtime <profile>] [--lines <count>]",
+      "  --lines <count>           show the last N records (default 50)",
+      "  runtime logs             reads the Worker process log instead",
+    ],
     status: [
       colors.accent(colors.strong("hypit status")),
       colors.dim("Show one Build now, or keep watching it without owning execution."),
@@ -887,6 +926,8 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
       colors.dim("Inspect one project-owned Build Result and its public Outputs."),
       "",
       "  hypit inspect <build-id> [--output <name>] [--limit <count>] [--workspace <project>]",
+      "  Defaults to targets and highlighted Outputs. --verbose expands other available Outputs.",
+      "  --output selects one exact name; --limit bounds expanded lists.",
     ],
     get: [
       colors.accent(colors.strong("hypit get")),
@@ -958,6 +999,7 @@ export function writeCliHelp(io: CliIo, topic?: string): void {
     colors.strong("Results"),
     row("builds", "list Results newest first"),
     row("history <output>", "find one named Output across Builds"),
+    row("logs <build-id> [--lines <count>]", "read saved Build execution phases and diagnostics"),
     row("status <build-id> [--watch]", "show current work and Result facts"),
     row("inspect <build-id>", "inspect one Result"),
     row("get <build-id> --output <name> --to <path>", "export one Build Output"),
@@ -969,7 +1011,7 @@ export function writeCliHelp(io: CliIo, topic?: string): void {
     row("runtime up|status|logs|down", "prepare and manage the local Build Runtime"),
     row("programs up|status|down", "manage declared external programs only"),
     row("packages install|status", "manage pinned upstream packages in the machine home"),
-    row("activity [--watch]", "inspect active Builds and shared capacity"),
+    row("activity [--watch]", "show active Builds and their current phases"),
     row("cancel <build-id>", "withdraw one active Build"),
     row("paths", "show physical state locations"),
     row("auth status|login|logout", "manage Endpoint credentials"),

package/packages/cli/src/view.ts

@@ -46,15 +46,27 @@ export type CliBuildResultView = {
   readonly targets: readonly string[];
   readonly omittedTargets?: number;
   readonly outputs: readonly CliOutputView[];
+  readonly outputCount: number;
+  /** Available Outputs outside the selected inspection scope. */
+  readonly otherOutputCount?: number;
   readonly omittedOutputs?: number;
   readonly failure?: string;
-  readonly operations?: BuildResultManifest["operations"];
+  readonly operations?: readonly Pick<NonNullable<BuildResultManifest["operations"]>[number],
+    "endpoint" | "status" | "receipt" | "failure">[];
+  readonly executionLog?: BuildResultManifest["executionLog"];
   readonly omittedOperations?: number;
 };
 
 export type CliBuildStatusView = {
   readonly id: string;
   readonly title?: string;
+  readonly targets?: readonly string[];
+  readonly failure?: string;
+  readonly commands?: readonly {
+    readonly id?: string;
+    readonly endpoint: string;
+    readonly progress: NonNullable<BuildView["commands"]>[number]["progress"];
+  }[];
   readonly work: {
     readonly state: "unknown" | "submitting" | "working" | "done";
     readonly outcome?: "complete" | "failed" | "cancelled";
@@ -68,6 +80,7 @@ export type CliBuildStatusView = {
   };
   readonly attention?: { readonly message: string; readonly action?: string };
   readonly operations?: readonly {
+    readonly count?: number;
     readonly id?: string;
     readonly receipt?: { readonly id: string; readonly url?: string };
     readonly endpoint: string;
@@ -127,8 +140,8 @@ function orderedOutputNames(manifest: BuildResultManifest): readonly string[] {
   const highlighted = new Set(manifest.highlightedOutputs ?? []);
   const targets = new Set(manifest.targets);
   return names.sort((left, right) => {
-    const leftRank = highlighted.has(left) ? 0 : targets.has(left) ? 1 : 2;
-    const rightRank = highlighted.has(right) ? 0 : targets.has(right) ? 1 : 2;
+    const leftRank = targets.has(left) ? 0 : highlighted.has(left) ? 1 : 2;
+    const rightRank = targets.has(right) ? 0 : highlighted.has(right) ? 1 : 2;
     return leftRank - rightRank || left.localeCompare(right);
   });
 }
@@ -146,14 +159,24 @@ export function buildStatusView(options: {
   readonly result?: BuildResultManifest;
   readonly resultReadError?: string;
   readonly verbose?: boolean;
-  readonly operationLimit?: number;
 }): CliBuildStatusView {
   const resultState = options.resultReadError !== undefined
     ? "unavailable" as const
     : options.result?.outcome ?? (options.result === undefined ? "missing" as const : "open" as const);
   const issue = options.runtime?.issue;
+  const operations = (options.runtime?.operations ?? options.result?.operations ?? [])
+    .filter((item) => options.verbose || item.status !== "completed");
   return {
     id: options.id,
+    ...((options.runtime?.targets ?? options.result?.targets) === undefined ? {} : {
+      targets: options.runtime?.targets ?? options.result!.targets,
+    }),
+    ...((options.result?.failure ?? options.runtime?.stop?.reason) === undefined ? {} : {
+      failure: options.result?.failure ?? options.runtime!.stop!.reason,
+    }),
+    ...(options.runtime?.commands?.length ? { commands: options.runtime.commands.map((command) => ({
+      ...(options.verbose ? { id: command.id } : {}), endpoint: command.endpoint, progress: command.progress,
+    })) } : {}),
     ...(options.result?.title === undefined ? {} : { title: options.result.title }),
     work: {
       state: workState(options.runtime, options.result),
@@ -176,13 +199,11 @@ export function buildStatusView(options: {
           }
         : { message: options.resultReadError! },
     }),
-    ...(!options.verbose ? {} : {
-      operations: (options.runtime?.operations ?? options.result?.operations ?? [])
-        .filter((item) => item.status !== "completed")
-        .slice(0, options.operationLimit ?? 20)
+    ...(operations.length > 0 ? {
+      operations: groupOperationViews(operations
         .map((item) => ({
-          ...("operation" in item ? { id: item.operation } : item.id === undefined ? {} : { id: item.id }),
-          ...(item.receipt === undefined ? {} : { receipt: item.receipt }),
+          ...(!options.verbose ? {} : "operation" in item ? { id: item.operation } : item.id === undefined ? {} : { id: item.id }),
+          ...(item.receipt === undefined || (!options.verbose && item.failure === undefined) ? {} : { receipt: item.receipt }),
           endpoint: item.endpoint,
           state: item.status,
           ...(item.progress === undefined ? {} : { progress: item.progress }),
@@ -190,23 +211,43 @@ export function buildStatusView(options: {
             code: item.failure.code,
             message: item.failure.message,
           } }),
-        })),
-    }),
+        })), options.verbose === true),
+    } : {}),
   };
 }
 
+function groupOperationViews(
+  operations: NonNullable<CliBuildStatusView["operations"]>,
+  verbose: boolean,
+): NonNullable<CliBuildStatusView["operations"]> {
+  if (verbose) return operations;
+  const groups = new Map<string, { view: typeof operations[number]; count: number }>();
+  for (const operation of operations) {
+    const key = JSON.stringify(operation);
+    const existing = groups.get(key);
+    if (existing !== undefined) existing.count += 1;
+    else groups.set(key, { view: operation, count: 1 });
+  }
+  return [...groups.values()].map(({ view, count }) => count === 1 ? view : { ...view, count });
+}
+
 export async function buildResultView(
   repository: BuildResultRepository,
   manifest: BuildResultManifest,
-  options: { readonly projectRoot: string; readonly output?: string; readonly limit: number },
+  options: { readonly projectRoot: string; readonly output?: string; readonly limit: number; readonly verbose?: boolean },
 ): Promise<CliBuildResultView> {
   if (options.output !== undefined && manifest.outputs[options.output] === undefined) {
     throw new Error(`Build Result ${manifest.id} has no public Output ${options.output}`);
   }
-  const allNames = options.output === undefined ? orderedOutputNames(manifest) : [options.output];
-  const selected = allNames.slice(0, options.limit);
+  const available = orderedOutputNames(manifest);
+  const allNames = options.output !== undefined ? [options.output] : options.verbose ? available
+    : available.filter((name) => manifest.targets.includes(name) || manifest.highlightedOutputs?.includes(name));
+  const selected = options.verbose ? allNames.slice(0, options.limit) : allNames;
   const outputs = await Promise.all(selected.map(async (name) =>
     await outputView(repository, manifest, name)));
+  const operations = options.verbose ? manifest.operations ?? []
+    : (manifest.operations ?? []).filter((item) => item.failure !== undefined);
+  const selectedOperations = options.verbose ? operations.slice(0, options.limit) : operations;
   return {
     id: manifest.id,
     ...(manifest.title === undefined ? {} : { title: manifest.title }),
@@ -217,12 +258,18 @@ export async function buildResultView(
     source: projectPath(manifest.source.path, options.projectRoot),
     ...(manifest.run === undefined ? {} : { run: projectPath(manifest.run.path, options.projectRoot) }),
     targetCount: manifest.targets.length,
-    targets: manifest.targets.slice(0, options.limit),
-    ...(manifest.targets.length <= options.limit ? {} : { omittedTargets: manifest.targets.length - options.limit }),
+    targets: manifest.targets,
+    outputCount: available.length,
     outputs,
+    ...(available.length === allNames.length ? {} : { otherOutputCount: available.length - allNames.length }),
     ...(selected.length === allNames.length ? {} : { omittedOutputs: allNames.length - selected.length }),
     ...(manifest.failure === undefined ? {} : { failure: manifest.failure }),
-    ...(manifest.operations === undefined ? {} : { operations: manifest.operations.slice(0, options.limit) }),
-    ...((manifest.operations?.length ?? 0) <= options.limit ? {} : { omittedOperations: manifest.operations!.length - options.limit }),
+    ...(manifest.executionLog === undefined ? {} : { executionLog: manifest.executionLog }),
+    ...(selectedOperations.length === 0 ? {} : { operations: selectedOperations.map((item) => options.verbose ? item : ({
+      endpoint: item.endpoint, status: item.status,
+      ...(item.receipt === undefined ? {} : { receipt: item.receipt }),
+      ...(item.failure === undefined ? {} : { failure: item.failure }),
+    })) }),
+    ...(selectedOperations.length === operations.length ? {} : { omittedOperations: operations.length - selectedOperations.length }),
   };
 }

package/packages/comment-sticker/README.md

@@ -1,7 +1,7 @@
 # `@hypit/comment-sticker`
 
-The Track Surface accepts `semantic={speech.semantic}` or `space={animation}`. Semantic context
-resolves Script Selections and Moments; authored space supports clock-based animation. Shared `at`
+The Track Surface accepts `timeline={program.timeline}`. The same Timeline supports authored
+positions and, where prepared Takes supply evidence, Script Selections and Moments. Shared `at`
 inputs accept a Moment or a time such as `2s`; `at` with `for` produces a Window where required.
 
 An author package for timed social-comment cards. It publishes an ordinary `VisualTrack` containing
@@ -21,7 +21,7 @@ The author surface keeps the three independent concerns visible:
 
 <comment:Style id="social-comment" recipe={styles.comment} font={fonts.ui}/>
 
-<comment:Track id="comments" canvas={video.canvas} semantic={speech.semantic}>
+<comment:Track id="comments" canvas={video.canvas} timeline={speech.timeline}>
   <comment:Sticker
     id="opening-comment"
     comment={comment-copy}

package/packages/comment-sticker/package.json

@@ -15,7 +15,7 @@
     "@hypit/narrative": "workspace:*",
     "@hypit/protocol": "workspace:*",
     "@hypit/program-space": "workspace:*",
-    "@hypit/semantic-track": "workspace:*",
+    "@hypit/timeline": "workspace:*",
     "@hypit/spatial": "workspace:*",
     "@hypit/svs": "workspace:*",
     "@hypit/temporal": "workspace:*",

package/packages/comment-sticker/src/component.ts

@@ -1,7 +1,7 @@
+import type { Timeline } from "@hypit/timeline";
 import type { ComponentPackage, ProducerHandlerContext } from "@hypit/component-kit";
 import { canonicalize } from "@hypit/protocol";
 import type { BlobRef, StoredValue } from "@hypit/protocol";
-import type { ProgramSpace } from "@hypit/program-space";
 import type { CanvasSpace, SpatialFrame } from "@hypit/spatial";
 import type { Text } from "@hypit/text";
 
@@ -28,7 +28,7 @@ function common(inputs: Record<string, { readonly value: StoredValue } | undefin
   return {
     set: inline<CommentStickerSet>(inputs.set?.value, "CommentStickerSet"),
     header: inline<CommentStickerHeader>(inputs.header?.value, "CommentStickerHeader"),
-    space: inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+    timeline: inline<Timeline>(inputs.timeline?.value, "Timeline"),
     frame: inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"),
     style: inline<CommentStickerStyle>(inputs.style?.value, "CommentStickerStyle"),
     spec: inline<CommentStickerItemSpec>(inputs.spec?.value, "CommentStickerItemSpec"),
@@ -69,7 +69,7 @@ export const commentStickerComponent = {
       handler: ({ inputs }: ProducerHandlerContext) => {
         const values = common(inputs);
         return { outputs: { set: output(appendProjectedCommentSticker(
-          values.set, values.header, values.space, values.frame, values.style, values.spec, values.content, values.window,
+          values.set, values.header, values.timeline, values.frame, values.style, values.spec, values.content, values.window,
           avatar ? inline<BlobRef>(inputs.avatar?.value, "Comment Sticker avatar") : undefined,
         )) }, needs: {} };
       },
@@ -85,7 +85,7 @@ export const commentStickerComponent = {
       producer: commentStickerProducers.render,
       handler: ({ inputs }) => ({ outputs: { track: output(renderCommentSticker(
         inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"),
-        inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+        inline<Timeline>(inputs.timeline?.value, "Timeline"),
         inline<CommentStickerProgram>(inputs.program?.value, "CommentStickerProgram"),
       )) }, needs: {} }),
     },

package/packages/comment-sticker/src/fragment.ts

@@ -1,4 +1,5 @@
-import { programSpaceTypes } from "@hypit/program-space";
+import { timelineTypes } from "@hypit/timeline";
+
 import { artifactTypes } from "@hypit/artifact";
 import { compositionTypes } from "@hypit/composition";
 import { sealGraphFragment } from "@hypit/elaborator";
@@ -82,7 +83,7 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
       inputs: {
         set: operation(current),
         header: input("header"),
-        space: input("space"),
+        timeline: input("timeline"),
         frame: input(item.frameName),
         style: input(item.styleName),
         window: input(item.windowName),
@@ -104,7 +105,7 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
     {
       id: "comment:track",
       producer: commentStickerProducers.render,
-      inputs: { canvas: input("canvas"), space: input("space"), program: operation("comment:program") },
+      inputs: { canvas: input("canvas"), timeline: input("timeline"), program: operation("comment:program") },
       result: { kind: "output", name: "track" },
     },
   );
@@ -112,7 +113,7 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
     inputs: [
       { name: "canvas", type: spatialTypes.canvas },
       { name: "header", type: commentStickerTypes.header },
-      { name: "space", type: programSpaceTypes.programSpace },
+      { name: "timeline", type: timelineTypes.track },
       ...[...types].map(([inputName, type]) => ({ name: inputName, type })),
     ],
     operations,

package/packages/comment-sticker/src/manifest.ts

@@ -1,3 +1,4 @@
+import { timelineTypes } from "@hypit/timeline";
 import { temporalContextAttributeVocabulary } from "@hypit/temporal-markup";
 import { readFile } from "node:fs/promises";
 
@@ -5,9 +6,9 @@ import { artifactDependency, artifactTypes } from "@hypit/artifact";
 import { compositionDependency, compositionTypes } from "@hypit/composition";
 import { fontArtifactSchema, mediaDependency, mediaTypes } from "@hypit/media";
 import { narrativeDependency } from "@hypit/narrative";
-import { programSpaceDependency, programSpaceTypes } from "@hypit/program-space";
+
 import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@hypit/protocol";
-import { semanticTrackDependency } from "@hypit/semantic-track";
+import { timelineDependency } from "@hypit/timeline";
 import { spatialDependency, spatialFrameSchema, spatialTypes } from "@hypit/spatial";
 import { svsRecipeType } from "@hypit/svs";
 import { temporalDependency, temporalTypes } from "@hypit/temporal";
@@ -134,7 +135,7 @@ export const commentStickerProgramSchema: ValueSchema = object({
 });
 const appendInputs = [
   { name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header },
-  { name: "space", type: programSpaceTypes.programSpace },
+  { name: "timeline", type: timelineTypes.track },
   { name: "frame", type: spatialTypes.frame }, { name: "style", type: commentStickerTypes.style },
   { name: "spec", type: commentStickerTypes.itemSpec },
   { name: "content", type: commentStickerTypes.content }, { name: "window", type: temporalTypes.window },
@@ -311,7 +312,7 @@ export const commentStickerMarkupSurfaces = [
             summary: "That Program rendered as one VisualTrack." },
         ],
         example: `
-<comment:Track id="comments" canvas={vertical} semantic={speech.semantic}>
+<comment:Track id="comments" canvas={vertical} timeline={speech.timeline}>
   <comment:Sticker id="one" frame={comment-frame} style={social} avatar={viewer-avatar}
     author="@viewer" meta="Featured" during={story.selection.reaction}>
     Wait, it pinned the caption to the word, not the second.
@@ -334,7 +335,7 @@ export const commentStickerManifest: ModuleManifest = {
   format: "hypit.module@1",
   name: commentStickerModuleRef.name,
   version: commentStickerModuleRef.version,
-  dependencies: [artifactDependency, narrativeDependency, programSpaceDependency, semanticTrackDependency, spatialDependency, temporalDependency, mediaDependency, compositionDependency, textDependency],
+  dependencies: [artifactDependency, narrativeDependency, timelineDependency, spatialDependency, temporalDependency, mediaDependency, compositionDependency, textDependency],
   types: [
     { name: commentStickerTypes.header.name },
     { name: commentStickerTypes.style.name },
@@ -366,7 +367,7 @@ export const commentStickerManifest: ModuleManifest = {
       needs: [],
     })),
     { name: commentStickerProducers.finalize.name, inputs: [{ name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header }], outputs: [{ name: "program", type: commentStickerTypes.program }], needs: [] },
-    { name: commentStickerProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: commentStickerTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
+    { name: commentStickerProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "timeline", type: timelineTypes.track }, { name: "program", type: commentStickerTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
   ],
 };
 

package/packages/comment-sticker/src/program.ts

@@ -1,3 +1,4 @@
+import type { Timeline } from "@hypit/timeline";
 import {
   assertVisualTrackIdentity,
   sealVisualTrack,
@@ -12,7 +13,6 @@ import type {
 } from "@hypit/composition";
 import { assertFontArtifactRef } from "@hypit/media";
 import { assertProgramSpaceIdentity } from "@hypit/program-space";
-import type { ProgramSpace } from "@hypit/program-space";
 import { canonicalize, isResourceId } from "@hypit/protocol";
 import type { BlobRef } from "@hypit/protocol";
 import { assertCanvasSpace, assertSpatialFrame } from "@hypit/spatial";
@@ -195,7 +195,7 @@ export function assertCommentStickerSet(value: CommentStickerSet): void {
 function realized(
   set: CommentStickerSet,
   header: CommentStickerHeader,
-  space: ProgramSpace,
+  timeline: Timeline,
   frame: SpatialFrame,
   style: CommentStickerStyle,
   spec: CommentStickerItemSpec,
@@ -229,7 +229,7 @@ function realized(
 export function appendProjectedCommentSticker(
   set: CommentStickerSet,
   header: CommentStickerHeader,
-  space: ProgramSpace,
+  timeline: Timeline,
   frame: SpatialFrame,
   style: CommentStickerStyle,
   spec: CommentStickerItemSpec,
@@ -237,8 +237,8 @@ export function appendProjectedCommentSticker(
   window: ProjectedWindow,
   avatar?: BlobRef,
 ): CommentStickerSet {
-  assertTemporalWindowFor(window, { subjectId: spec.id, space });
-  return realized(set, header, space, frame, style, spec, content, window, avatar);
+  assertTemporalWindowFor(window, { subjectId: spec.id, space: timeline });
+  return realized(set, header, timeline, frame, style, spec, content, window, avatar);
 }
 
 export function assertCommentStickerProgram(value: CommentStickerProgram): void {
@@ -589,12 +589,12 @@ function stickerElements(item: CommentStickerItemProgram): readonly VisualElemen
   return elements;
 }
 
-export function renderCommentSticker(canvas: CanvasSpace, space: ProgramSpace, program: CommentStickerProgram): VisualTrack {
+export function renderCommentSticker(canvas: CanvasSpace, timeline: Timeline, program: CommentStickerProgram): VisualTrack {
   assertCanvasSpace(canvas);
-  assertProgramSpaceIdentity(space);
+  assertProgramSpaceIdentity(timeline);
   assertCommentStickerProgram(program);
   const track = sealVisualTrack({
-    programSpaceId: space.id,
+    programSpaceId: timeline.id,
     visualIr: "hypit.visual-ir@1",
     id: program.id,
     presents: program.items.map((item) => ({
@@ -605,6 +605,6 @@ export function renderCommentSticker(canvas: CanvasSpace, space: ProgramSpace, p
       elements: stickerElements(item),
     })),
   });
-  assertVisualTrackIdentity(track, space);
+  assertVisualTrackIdentity(track, timeline);
   return track;
 }