Skip to content

fix: repoint MCP output-schemas import to kernel/device (unbreak main)#943

Merged
thymikee merged 1 commit into
mainfrom
fix/mcp-output-schemas-kernel-device-import
Jun 30, 2026
Merged

fix: repoint MCP output-schemas import to kernel/device (unbreak main)#943
thymikee merged 1 commit into
mainfrom
fix/mcp-output-schemas-kernel-device-import

Conversation

@thymikee

Copy link
Copy Markdown
Member

main is currently red. #941 (MCP outputSchema) and #940 (move errors/redaction/devicesrc/kernel/) merged in an order where #940's import-rewrite codemod ran before #941's new src/mcp/command-output-schemas.ts existed — so that file still imports ../utils/device.ts, which #940 deleted. tsc/build fail on main.

One-line fix: ../utils/device.ts../kernel/device.ts. Swept the tree — this is the only stale utils/{device,errors,redaction} import remaining.

Verified: tsc --noEmit 0, oxlint --deny-warnings clean, vitest run src/mcp pass.

#941 (MCP outputSchema) and #940 (errors/redaction/device -> src/kernel) merged
in an order where #940's import codemod never saw #941's new
command-output-schemas.ts, so it still imports '../utils/device.ts' — which no
longer exists. tsc/build on main is red. Repoint the import at
'../kernel/device.ts'. The only stale reference on main.
thymikee added a commit that referenced this pull request Jun 30, 2026
The kernel move (#940) deleted src/utils/device.ts; #941's
command-output-schemas.ts (merged after #940's codemod ran) still imported the
old path. Same one-line fix as #943; de-dups once that lands.
@thymikee

Copy link
Copy Markdown
Member Author

Reviewed current head 6d183a0. This is the expected one-line repair for the main break introduced by the merge order: src/mcp/command-output-schemas.ts now imports DEVICE_TARGETS / PLATFORMS from ../kernel/device.ts instead of the deleted ../utils/device.ts.

I checked the PR diff and swept for remaining stale utils/{device,errors,redaction} imports on the PR head; none remain. git diff --check is clean. Typecheck, lint/format, unit, integration, layering, fallow, and the other code gates are passing.

The Bundle Size check is failing while measuring the base commit 7a1640e, which is the broken main state this PR fixes, so I do not treat that as a PR-head blocker. No actionable blockers from my side; labeling ready-for-human for maintainer judgment.

@thymikee thymikee added the ready-for-human Valid work that needs human implementation, judgment, or maintainer merge label Jun 30, 2026
@thymikee thymikee merged commit bb45967 into main Jun 30, 2026
20 of 21 checks passed
@thymikee thymikee deleted the fix/mcp-output-schemas-kernel-device-import branch June 30, 2026 05:41
@github-actions

Copy link
Copy Markdown
PR Preview Action v1.8.1
Preview removed because the pull request was closed.
2026-06-30 05:42 UTC

thymikee added a commit that referenced this pull request Jun 30, 2026
…ase 4 (#942)

* feat: leveled response views + --level knob, with a snapshot digest — Phase 4

Add the agent-cost leveled-response system: a responseLevel knob
(digest | default | full) plumbed end to end behind a global --level flag
(mirroring --cost), and a per-command ResponseView registry applied in the
router on the success path.

- contracts: RESPONSE_LEVELS/ResponseLevel + meta.responseLevel + boundary
  schema whitelist. Plumbing mirrors --cost: cli-flags FlagDefinition +
  GLOBAL_FLAG_KEYS, AgentDeviceClientConfig + overrides, buildClientConfig,
  buildMeta. ResponseLevel exported from the public root.
- src/daemon/response-views.ts: the ResponseView registry. Seeds the snapshot
  digest — the full node tree (the dominant token sink) collapses to
  { nodeCount, refs: first 12 hittable/non-occluded refs with labels } plus the
  cheap top-level signals (truncated/visibility/snapshotQuality). full returns
  today's shape (nothing richer is computed yet).
- router graft (applyResponseLevelView + applyAgentCostGrafts): composes with
  the existing cost block. With responseLevel default (or unset) AND no
  registered view AND no --cost, the original response is returned UNCHANGED —
  byte-identical to today (Maestro .ad recompare safe). cost.nodeCount reads the
  original node tree so it stays accurate even after a digest.

Tests: snapshot view unit test (digest filters hittable/occluded, drops the
tree, keeps cheap signals; default/full passthrough); router graft test via an
injected view (default identity byte-identical, digest applies, full passthrough,
digest+cost composition, unregistered-command passthrough, boundary parse).

Verified: tsc, oxfmt + oxlint --deny-warnings, fallow audit clean, rslib build,
Layering Guard empty, 1106 daemon/contracts/client tests pass (incl. the
existing cost/typed-error grafts after the restructure).

* fix: repoint MCP output-schemas import to kernel/device (rebase fixup)

The kernel move (#940) deleted src/utils/device.ts; #941's
command-output-schemas.ts (merged after #940's codemod ran) still imported the
old path. Same one-line fix as #943; de-dups once that lands.

* fix: re-classify responseLevel flag in integration-progress model

The --level/responseLevel flag is a diagnostics/output flag (not device-
observable), classified in the exclusion bucket alongside --cost. (Lost in an
earlier rebase; re-applying.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-human Valid work that needs human implementation, judgment, or maintainer merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant