fix(daemon): resolve HyperFrames backport conflicts

Author: Siri-Ray

apps/daemon/src/server.ts

@@ -1672,12 +1672,8 @@ export function createAgentRuntimeToolPrompt(
     '',
     `- Daemon URL: \`${daemonUrl}\` (also available as \`OD_DAEMON_URL\`).`,
     '- `OD_NODE_BIN` is the absolute path to the Node-compatible runtime that started the daemon; packaged desktop installs provide this even when the user has no system `node` on PATH.',
-<<<<<<< HEAD
-    '- `OD_BIN` is the absolute path to the Open Design CLI script. On POSIX shells run wrappers with `"$OD_NODE_BIN" "$OD_BIN" tools ...`; do not call bare `od`, which may resolve to the system octal-dump command on Unix-like systems.',
-=======
     '- `OD_HYPERFRAMES_BIN` is the absolute path to Open Design\'s pinned HyperFrames CLI. Run lightweight commands through `OD_NODE_BIN`; use `"$OD_NODE_BIN" "$OD_BIN" media scaffold` for composition setup and never use a user-level `npx` cache.',
-    '- `OD_BIN` is the absolute path to the OpenDesign CLI script. On POSIX shells run wrappers with `"$OD_NODE_BIN" "$OD_BIN" tools ...`; do not call bare `od`, which may resolve to the system octal-dump command on Unix-like systems.',
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+    '- `OD_BIN` is the absolute path to the Open Design CLI script. On POSIX shells run wrappers with `"$OD_NODE_BIN" "$OD_BIN" tools ...`; do not call bare `od`, which may resolve to the system octal-dump command on Unix-like systems.',
     '- On PowerShell use `& $env:OD_NODE_BIN $env:OD_BIN tools ...`; on cmd.exe use `"%OD_NODE_BIN%" "%OD_BIN%" tools ...`.',
     tokenLine,
     '- Prefer project wrapper commands through `OD_NODE_BIN` + `OD_BIN` over raw HTTP. The wrappers read these environment values automatically.',

apps/daemon/tests/prompts/__snapshots__/system-prompt-matrix.test.ts.snap

@@ -48,11 +48,7 @@ exports[`composeSystemPrompt — scenario × section golden matrix > keeps the s
       "clarifying-questions",
       "role-marker-guard",
     ],
-<<<<<<< HEAD
-    "totalChars": 45969,
-=======
-    "totalChars": 46059,
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+    "totalChars": 46066,
   },
   "critique-enabled": {
     "sections": [
@@ -283,11 +279,7 @@ exports[`composeSystemPrompt — scenario × section golden matrix > keeps the s
       "clarifying-questions",
       "role-marker-guard",
     ],
-<<<<<<< HEAD
-    "totalChars": 45967,
-=======
-    "totalChars": 46057,
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+    "totalChars": 46064,
   },
   "memory-hooks-off": {
     "sections": [

design-templates/hyperframes/references/html-in-canvas.md

@@ -12,11 +12,7 @@ The HTML-in-Canvas API (`drawElementImage`) lets you capture live, rendered DOM
 >
 > HyperFrames enables this flag automatically during rendering (`--enable-features=CanvasDrawElement`), so rendered videos work without manual setup. The flag is only needed for live preview in the Studio.
 
-<<<<<<< HEAD
-When this skill runs inside Open Design, the daemon shells out to `npx hyperframes render`, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
-=======
-When this skill runs inside OpenDesign, the daemon invokes its pinned HyperFrames runtime, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+When this skill runs inside Open Design, the daemon invokes its pinned HyperFrames runtime, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
 
 ## How it works
 
@@ -152,8 +148,4 @@ HyperFrames enables the Chrome flag automatically during rendering. Inside Open
   --output my-video.mp4
 ```
 
-<<<<<<< HEAD
-For Docker renders, the flag is also enabled automatically inside the container. Inside Open Design, the daemon's `npx hyperframes render` call (`apps/daemon/src/media/index.ts`) inherits the same default — you don't need to thread anything through.
-=======
-For Docker renders, the flag is also enabled automatically inside the container. OpenDesign's daemon-managed render inherits the same default — you don't need to thread anything through.
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+For Docker renders, the flag is also enabled automatically inside the container. Open Design's daemon-managed render inherits the same default — you don't need to thread anything through.

plugins/_official/examples/hyperframes/references/html-in-canvas.md

@@ -12,11 +12,7 @@ The HTML-in-Canvas API (`drawElementImage`) lets you capture live, rendered DOM
 >
 > HyperFrames enables this flag automatically during rendering (`--enable-features=CanvasDrawElement`), so rendered videos work without manual setup. The flag is only needed for live preview in the Studio.
 
-<<<<<<< HEAD
-When this skill runs inside Open Design, the daemon shells out to `npx hyperframes render`, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
-=======
-When this skill runs inside OpenDesign, the daemon invokes its pinned HyperFrames runtime, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+When this skill runs inside Open Design, the daemon invokes its pinned HyperFrames runtime, which inherits the auto-enable. You do **not** need to add browser flags or pass extra CLI args from the agent.
 
 ## How it works
 
@@ -152,8 +148,4 @@ HyperFrames enables the Chrome flag automatically during rendering. Inside Open
   --output my-video.mp4
 ```
 
-<<<<<<< HEAD
-For Docker renders, the flag is also enabled automatically inside the container. Inside Open Design, the daemon's `npx hyperframes render` call (`apps/daemon/src/media/index.ts`) inherits the same default — you don't need to thread anything through.
-=======
-For Docker renders, the flag is also enabled automatically inside the container. OpenDesign's daemon-managed render inherits the same default — you don't need to thread anything through.
->>>>>>> 0d53c96be (fix daemon HyperFrames scaffold and runtime (#7030))
+For Docker renders, the flag is also enabled automatically inside the container. Open Design's daemon-managed render inherits the same default — you don't need to thread anything through.