feat(desktop): gate skills by backend capabilities

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.

[Nyvo-io]

Summary

Part of #1148 (Part 2: Desktop host-capability gating).

• build a real Desktop HostCapabilities surface from the assembled builtin tools and capability groups;
• pass backend-specific capabilities to both the system skill prompt and the Skill tool;
• resolve the Skill tool host per session so child backends cannot overwrite the parent session surface;
• clear cached skill hosts when sessions are archived or removed;
• preserve existing Desktop skill discovery, UI, MCP behavior, and tool assembly.

Implementation

The prompt and lazy Skill loader now share the same host gate. Required tools and required capabilities are filtered consistently with the CLI. Main-session backend tools determine the effective host, while the static Desktop surface supports prompt construction before backend creation. Child backends intentionally do not update the Desktop session resolver.

Verification

• npm --workspace @maka/runtime run typecheck
• runtime skill and skill-invocation tests: 39 passed
• npm --workspace @maka/desktop run build:main
• Desktop skills tests: 36 passed
• changed-file Biome lint passed
• independent Codex review: no patch-specific correctness issue
• npx tsc -p apps/desktop/tsconfig.main.json --noEmit --pretty false --incremental false passed

The full Desktop renderer typecheck is currently blocked by the clean worktree missing the existing simple-icons dependency; Desktop main typecheck is green.

Scope

Desktop discoverable IPC, inline invocation chips, and other Part 3 work remain out of scope.

[Nyvo-io]

The failing test check is caused by the current base commit, not this skill-gating patch. main at d0407f71 fails the same three headless source-contract tests after #1122 reformatted their target runner statements: https://github.com/maka-agent/maka-agent/actions/runs/29674210573.

I opened the scoped follow-up #1226 to make those three assertions layout-tolerant while preserving their semantic contracts. #1224 remains limited to #1148 Part 2; typecheck and e2e are green, and it is mergeable. Once #1226 lands, I will rebase/rerun #1224.

[Astro-Han]

Approving with two findings:

P2: HostCapabilities omits the existing agent tool group. toolAvailability.groups includes buildSubagentToolGroup() with the agent id, but both capability-building loops only add rive, office, browser, and computer_use. A skill with required-capabilities: [agent] is hidden from the prompt and rejected by Skill even though the parent session has the agent tools. Please derive the capability set from the effective tool groups, or add agent consistently to the static and per-session hosts.

P3: The comments in packages/runtime/src/skills.ts still say the Desktop call sites use the legacy ungated path. This PR changes both call sites to pass a host, so those comments are now stale.

I found no other patch-specific issues. I also tested the PR with #1226 merged locally; the full workspace test suite passed.

[Astro-Han]

The falling test has been fixed by #1226.

[Nyvo-io]

Rebased onto the latest main after #1226 was merged.

The rebase preserves the #1099 binding-derived desktopHostCapabilities surface while adding #1224's session-scoped resolveDesktopSkillHost fallback for prompt and Skill-tool loading. I also updated the source-contract test to follow the new catalog-derived wiring.

New head: 72ed8027

Verification:

• runtime typecheck
• runtime skills focused tests: 32/32
• Desktop main build
• Desktop skills focused tests: 36/36
• Biome check and git diff --check
• GitHub CI: typecheck, test, and e2e all pass

[Astro-Han]

Merged, thanks.

One non-blocking follow-up: backendSkillHost still derives capabilities from a hand-maintained list instead of buildHostCapabilitiesFromBinding(backendToolNames). There is no current shipped-skill regression: office is the only catalog capability tag today, and both paths preserve it. Still, using the catalog helper would keep the session-specific host aligned with #1099 and avoid future drift.

The two stale comments in packages/runtime/src/skills.ts that say Desktop still uses the ungated path can be removed at the same time.