creatixchu
73527c47bd
Merge remote-tracking branch 'origin/master' into worktree/drop-create-by-name
2026-08-10 15:49:49 +08:00
creatixchu
a832fc2fa5
Merge remote-tracking branch 'origin/master' into worktree/drop-create-by-name
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-25-session-list-browsing-and-manual-order.i18n.yaml
# .agents/notes/implemented/feature/2026-07-25-workspace-ui-product-flow.i18n.yaml
# .agents/notes/implemented/feature/2026-07-25-workspace-ui-product-flow.zh.md
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.i18n.yaml
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.md
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.zh.md
# apps/cli/reference/README.i18n.yaml
# docs/config-catalog.md
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-approval.spec.ts
# packages/host/apiproxy/tests/api-proxy-blank.spec.ts
# packages/host/apiproxy/tests/api-proxy-cold.spec.ts
# packages/host/apiproxy/tests/api-proxy-commands.spec.ts
# packages/host/apiproxy/tests/api-proxy-config.spec.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/host/apiproxy/tests/api-proxy-projections.spec.ts
# packages/host/apiproxy/tests/api-proxy-question.spec.ts
# packages/host/apiproxy/tests/api-proxy-rename.spec.ts
# packages/host/apiproxy/tests/api-proxy-search.spec.ts
# packages/host/apiproxy/tests/api-proxy-subagents.spec.ts
# packages/host/apiproxy/tests/api-proxy-view.spec.ts
# packages/host/apiproxy/tests/api-proxy-workspace.spec.ts
# packages/todo/tool-todo/tests/projection.spec.ts
# scripts/hero-composer-dom-continuity.mjs
2026-08-10 15:49:34 +08:00
pku-xht
18923e131b
Merge commit '25de3fbe05f0c1561344d21c2e6280529fbefb20' into codex/product-subagent-presets
2026-08-10 15:47:30 +08:00
creatixchu
2fea703d67
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
2026-08-10 15:19:32 +08:00
Yichen Jiang
02d45ed004
Merge remote-tracking branch 'origin/master' into fix/preset-host-plane-task-registry
2026-08-10 15:04:49 +08:00
Yichen Jiang
5d86a284e5
fix(web-app,agent-presets): keep the task registry on the host plane
...
`tool-bash` resolves the background-task registry with `ctx.get('tasks')`,
and it sits at the preset's top level. The registry sat inside an
entry-local `isolate: { tasks: true }` realm, which is invisible to every
sibling row outside it, while the Web surface disabled the host row — so
both lookups missed and every `run_in_background` call answered
"background tasks unavailable" with `task_output`, `task_list`, and
`task_kill` still listed in the catalog. `task_list` returning
"(no background tasks)" is what made the outage read as an empty queue
rather than a severed producer.
That is the `goals` criterion read from inside the preset: a Service a row
outside its realm READS belongs to the plane both can see. `tasks` already
keys access by owning agent (`assertAccess` compares `task.owner.id`) and
mints an independent token per `attachSurface` call, so one host instance
serves every session exactly as before presets — the per-preset-standing-mounts
note records that sharing `tasks-local` is a return to its design.
`minimal` mounts no `tool-tasks`, and the `start()` control-surface gate is
a service-wide set that another preset's controls would open for it, so its
`tool-bash` disables `run_in_background` and drops the parameter from the
schema.
Fixes #2141
2026-08-10 14:18:41 +08:00
pku-xht
9f6ec0ead6
test(subagent): exercise native Windows Claude shim
2026-08-10 13:34:10 +08:00
Turtle
a7fc81d745
docs: replace front door terminology
2026-08-10 13:07:46 +08:00
pku-xht
95d5735e05
Merge commit '851f05c4f8ae58415224ce1b562962b0c39621ac' into codex/product-subagent-presets
...
# Conflicts:
# packages/bundle/base/tests/base.spec.ts
2026-08-10 13:05:13 +08:00
pku-xht
48025c9064
Merge commit '404501a41ccf2a3b638b1b737087948fe08d5c4c' into codex/product-subagent-presets
...
# Conflicts:
# packages/subagent/subagent-claude-code/tests/real-product.spec.ts
2026-08-10 12:59:50 +08:00
pku-xht
b1d67a6935
feat(agent-presets): add Codex and Claude Code subagent tools
2026-08-10 12:45:05 +08:00
Huanqi Cao
c9285753de
Merge branch 'merge/1829-master' into merge/1990-1829
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
2026-08-10 12:35:32 +08:00
creatixchu
3764ce62a5
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/connection/src/client/fixture.ts
# packages/host/apiproxy/src/api-proxy.ts
2026-08-10 12:33:36 +08:00
Huanqi Cao
2a6aba0f48
Merge remote-tracking branch 'origin/master' into merge/1829-master
...
# Conflicts:
# apps/cli/package.json
# pnpm-lock.yaml
2026-08-10 12:32:14 +08:00
Yichen Jiang
b87e2240bf
Merge pull request #1543 from deepseek-harness/stack/agent-profiles-8-authoring
...
feat(web): author agent presets from a settings page
2026-08-10 11:55:58 +08:00
creatixchu
52df428a10
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
2026-08-10 11:28:25 +08:00
Huanqi Cao
a3a91aa654
Merge branch 'merge/1829-master' into merge/1990-1829
...
# Conflicts:
# vitest.config.ts
2026-08-10 11:24:58 +08:00
Huanqi Cao
a7b973757b
Merge remote-tracking branch 'origin/master' into merge/1829-master
2026-08-10 11:23:08 +08:00
Huanqi Cao
ee38c2540b
Merge branch 'merge/1829-master' into merge/1990-1829
2026-08-10 11:12:52 +08:00
Huanqi Cao
2474b6e638
Merge remote-tracking branch 'origin/master' into merge/1829-master
...
# Conflicts:
# scripts/project-doc-site.spec.ts
2026-08-10 11:12:39 +08:00
Yichen Jiang
c06f9041fc
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/subsystems/attachment.i18n.yaml
# docs/subsystems/attachment.md
# docs/subsystems/attachment.zh.md
# docs/subsystems/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/client/runtime/package.json
# packages/client/ui-conversation/package.json
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/self-modification/tool-cordis/src/api-catalog.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
2026-08-09 23:33:35 +08:00
Huanqi Cao
a29966b71f
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.i18n.yaml
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.md
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.md
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 23:19:14 +08:00
Tianyi Cui
35d4b5bf7c
Merge branch 'worktree/schedule-conversational-after' into worktree/schedule-explicit-at
2026-08-09 23:12:26 +08:00
Tianyi Cui
71406c1969
Merge remote-tracking branch 'origin/master' into worktree/schedule-conversational-after
2026-08-09 23:12:14 +08:00
Yichen Jiang
7dcefeda50
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# apps/cli/tests/web-agent-presets.e2e.ts
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-primitives/tests/icons.spec.tsx
# packages/client/ui-settings/src/client/contract/slots.ts
# packages/host/apiproxy/tests/api-proxy-agent-preset.spec.ts
2026-08-09 23:02:37 +08:00
Huanqi Cao
2720091429
Merge remote-tracking branch 'origin/master' into feat/windows-pwsh-default
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-01-windows-pwsh-default.i18n.yaml
# .agents/notes/proposed/feature/2026-08-01-windows-pwsh-default.md
# .agents/notes/proposed/feature/2026-08-01-windows-pwsh-default.zh.md
2026-08-09 22:59:34 +08:00
Yichen Jiang
877364f7a4
Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# packages/client/ui-conversation/tests/input-bar.spec.tsx
2026-08-09 22:57:23 +08:00
Yichen Jiang
4926b296c4
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# docs/persistence-catalog.i18n.yaml
# docs/persistence-catalog.md
# docs/persistence-catalog.zh.md
2026-08-09 22:56:44 +08:00
Yichen Jiang
d7605c62e9
test(cli): give the layered-skills e2e sessions run-unique ids
...
The suite composes over the ambient DSH home, so a fixed session id
collides with the log a previous run persisted once the tool-execution
path checks persisted identity.
2026-08-09 22:49:01 +08:00
Yichen Jiang
0d7106d902
Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# apps/cli/tests/web-agent-presets.e2e.ts
# packages/host/apiproxy/tests/api-proxy-agent-preset.spec.ts
2026-08-09 22:48:47 +08:00
Yichen Jiang
4b9bde551b
test(cli): prove the global skill layer reaches preset-composed agents
...
The shipped-Web e2e enables the bundled badge skill as a stand-in for a
repository plugin's deployment-level provider and asserts the layering both
ways: a standard-preset agent's view merges the global layer with its
preset's local discovery and its loader tool resolves the global skill,
while the host view stays global-only and a core-web agent can read the
layer but composes no loader tool.
2026-08-09 22:18:34 +08:00
Yichen Jiang
0b2f32740d
Revert "test(repository-plugin): drop the skill contribution from the preset-composed e2e"
...
This reverts commit f12c131ee9fdbc01b9294c8dc2c73cd36ab717cf.
The layered host skill registry closes the gap the bypass recorded: a
repository plugin's skill root registers into the global layer and reaches
every preset-composed session's catalog, so the fixture declares its skill
root again and the e2e proves the full skill, MCP, and TypeScript
contribution set. The accidental .claude/launch.json from that commit goes
with it.
2026-08-09 22:10:50 +08:00
Yichen Jiang
4788569889
feat(skill): layer the host skill registry per scope like the tools registry
...
The skills capability moves back to the host plane as one singleton, layered
with the ScopedLayers infrastructure the tools registry established: a
registration files into its calling context's layer (repository plugins and
host rows land global, a preset's skill-local lands in that preset's layer),
and a read merges the global layer with the viewing scope's chain, the
nearest layer winning duplicate names outright while rank keeps deciding
duplicates within one layer.
The web-app bundle re-enables the base skill registry row (skill-local and
tool-skill stay preset-owned), the standard preset drops its isolate skills
realm for bare rows over the host registry, tool-skill passes the calling
agent as the view scope, and the gateway's skills domain reads the host
registry in the presenter scope — a cold session now resolves its recorded
preset's standing key instead of failing.
2026-08-09 22:10:38 +08:00
Tianyi Cui
525ea43f0b
Merge branch 'worktree/ci-native-windows-20260808' into worktree/ci-native-windows-coverage-20260808
...
# Conflicts:
# packages/subagent/subagent-codex/README.i18n.yaml
# packages/subagent/subagent-codex/README.md
# packages/subagent/subagent-codex/README.zh.md
2026-08-09 21:52:02 +08:00
Tianyi Cui
bf38526354
Merge remote-tracking branch 'origin/master' into worktree/ci-native-windows-20260808
...
# Conflicts:
# .agents/notes/archived/process/2026-07-27-wine-windows-gates-experiment.i18n.yaml
2026-08-09 21:48:01 +08:00
Tianyi Cui
4619f183ff
fix(cli): drain native handles on normal exit
2026-08-09 21:44:57 +08:00
Tianyi Cui
da636ad97f
Merge worktree/schedule-conversational-after into worktree/schedule-explicit-at
2026-08-09 21:31:37 +08:00
Tianyi Cui
01776dd230
Merge origin/master into worktree/schedule-conversational-after
2026-08-09 21:30:00 +08:00
Tianyi Cui
25dcd7293c
docs: purge chain-of-thought leakage from prose
...
Delete design-session citations (decision/audit/plan ordinals, stack
positions), change narration, review choreography, and reviewer-addressed
justification from comments, JSDoc, docs, READMEs, Agent Notes, tests, and
generator templates; restate every affected fact as current-state contract
prose. Fix generated docs at their sources and regenerate the catalogs and
cordis-surface regions; re-paste type-equiv blocks; update every bilingual
counterpart and re-record the pairs. Record the citation rule in the
committed-artifact-citations Agent Note.
2026-08-09 21:10:59 +08:00
Yichen Jiang
8612f39759
Merge remote-tracking branch 'origin/stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-09 20:41:55 +08:00
Yichen Jiang
801d39d131
Merge remote-tracking branch 'origin/stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/architecture.zh.md
# docs/module-graph.md
# packages/host/apiproxy/src/api-proxy.ts
# scripts/verify-package-readme-model-experience.ts
2026-08-09 20:38:21 +08:00
Yichen Jiang
f80d2a742e
Merge remote-tracking branch 'origin/stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# docs/module-graph.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/tsconfig.json
2026-08-09 20:33:55 +08:00
Huanqi Cao
63ad5d6d98
refactor(cli): drop the redundant existence pre-check in resolveWindowsShellLayer
...
loadOverlayPatches already throws on a missing file (the caller named
it, so absence is a misconfiguration) — the existsSync guard was a
second fail-loud mechanism for the same miss with a prettier message.
The loader's throw keeps the fail-loud contract the Windows-default
note records.
2026-08-09 18:53:38 +08:00
Huanqi Cao
f5caadc808
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# packages/bash/pwsh-local/src/index.ts
# packages/sandbox/sandbox-local/src/index.ts
2026-08-09 17:50:55 +08:00
Huanqi Cao
8af10a54b9
Merge remote-tracking branch 'origin/master' into feat/windows-pwsh-default
2026-08-09 17:45:36 +08:00
Tianyi Cui
88096fb2da
Merge remote-tracking branch 'origin/master' into worktree/ci-native-windows-20260808
2026-08-09 17:25:15 +08:00
Huanqi Cao
165ad7e969
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.i18n.yaml
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 16:59:52 +08:00
Huanqi Cao
018009338b
Merge remote-tracking branch 'origin/master' into feat/windows-pwsh-default
...
# Conflicts:
# .agents/notes/proposed/feature/2026-08-01-windows-pwsh-default.i18n.yaml
# .agents/notes/proposed/feature/2026-08-01-windows-pwsh-default.zh.md
# packages/bundle/base/README.i18n.yaml
# packages/bundle/base/README.md
# packages/bundle/base/README.zh.md
2026-08-09 16:37:48 +08:00
Tianyi Cui
b7ec8429a9
refactor(schedule): make absolute times explicit
2026-08-09 16:30:11 +08:00
Turtle
9704749b01
docs: replace vague provenance prose with recorded facts
2026-08-09 15:35:02 +08:00
