You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit c1378c6
Browse filesBrowse the repository at this point in the historyBrowse files
Merge upstream/main (08d05eb) into blanket-auto-deny-commands
Resolve the 22-file / 92-hunk conflict surface:
- adopt-main (17 files): the four add/add Zoo-Code-Org#1505 duplicates
(effective-tool-policy.ts, effective-tool-policy.spec.ts,
build-tools.spec.ts, generateSystemPrompt.spec.ts), the P-theme
sections/{capabilities,objective,rules,skills}.ts + system.ts + their
specs + ask-mode-prompt.snap, filter-tools-for-mode.ts + its spec,
zoo-gateway.spec.ts, restart-persistence.test.ts (main's Zoo-Code-Org#1663
polling supersedes the branch poll rewrite).
- generateSystemPrompt.ts: adopt-main; the branch D-adjacent
provider-state snapshot call-site (disabledTools + modelInfo args to
SYSTEM_PROMPT) is identical to main's — no re-apply needed.
- presentAssistantMessage.ts: keep main's buildToolRequirements(disabledTools,
modelInfo?.info) call (matches the adopted two-arg policy API); the
branch AutoApprovalContext threading survived the auto-merge.
- presentAssistantMessage-custom-tool.spec.ts, Task.ts, Task.spec.ts:
take main's side of every conflicted hunk (branch hunks were P/L-theme
duplicates of main's Zoo-Code-Org#1505/Zoo-Code-Org#1625 rework); branch D-theme glue outside
the conflict regions is preserved by the auto-merge.
- Delete src/core/prompts/tools/__tests__/effective-tool-policy-warn.spec.ts:
mechanical orphan of the adopt-main resolution — main's
effective-tool-policy.ts never exported warnProtocolToolOverrides, so
the branch-only spec cannot compile at the merged head.
- presentAssistantMessage-auto-deny.spec.ts (branch-only, non-conflicting):
add the getTaskMode mock the merged impl now requires (main Zoo-Code-Org#1625 reads
the task-local mode); test-double drift invisible to the textual merge.
0 commit comments