mirror of
https://github.com/qwibitai/nanoclaw.git
synced 2026-07-15 19:06:18 +08:00
b0badcac7f
Conflict resolutions:
- setup/set-env.ts: keep the upsertEnvVar extraction; drop the
--sync-container block — main removed the dead data/env/env secrets
mirror (c82f062d) and nothing reads it.
- src/config.ts: union — DEFAULT_AGENT_PROVIDER export + main's new env
keys and the ASSISTANT_HAS_OWN_NUMBER deprecation note.
- src/cli/resources/groups.ts: take main's initGroupFilesystem call
(#2415 workspace provisioning); it stamps the instance default
provider via ensureContainerConfig inside, so the feature's intent is
preserved without the bare ensureContainerConfig call.
- .claude/skills/manage-channels/SKILL.md: keep main's channel-defaults
paragraph + this branch's instance-default provider wording (the
register step has no --provider flag on either side).
- create-agent.test.ts: main's vi.hoisted guard-seam harness minus
mockUpdateScalars — provider now flows through initGroupFilesystem.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>