feat(guardrails): plan→auto chain + upstream sync infra + v1.4.1 merge

.gitattributes

@@ -0,0 +1,30 @@
+# Fork-only paths: always keep our version during upstream merge
+# These directories/files exist only in Cor-Incorporated/opencode, not in upstream (anomalyco/opencode)
+# Using merge=ours driver: `git config merge.ours.driver true`
+
+# Core fork additions
+packages/opencode/src/hook/**         merge=ours
+packages/opencode/src/memory/**       merge=ours
+packages/opencode/src/notification/** merge=ours
+packages/opencode/src/session/repetition.ts merge=ours
+packages/opencode/src/session/prompt/glm.txt merge=ours
+packages/opencode/test/hook/**        merge=ours
+
+# Guardrails plugin package
+packages/guardrails/**                merge=ours
+
+# Fork-specific config
+.opencode/**                          merge=ours
+
+# Fork documentation
+docs/ai-guardrails/**                 merge=ours
+docs/comparison/**                    merge=ours
+FORK.md                               merge=ours
+
+# Fork-specific migrations
+packages/opencode/migration/20260405053632_add-memory-table/** merge=ours
+
+# Fork-specific CI workflows
+.github/workflows/seed-verify.yml     merge=ours
+.github/workflows/upstream-sync.yml   merge=ours
+.github/workflows/workflow-sync.yml   merge=ours

.opencode/agent/api-designer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/api-designer.md

.opencode/agent/architect.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/architect.md

.opencode/agent/backend-developer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/backend-developer.md

.opencode/agent/build-error-resolver.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/build-error-resolver.md

.opencode/agent/cloud-architect.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/cloud-architect.md

.opencode/agent/code-reviewer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/code-reviewer.md

.opencode/agent/database-administrator.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/database-administrator.md

.opencode/agent/database-optimizer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/database-optimizer.md

.opencode/agent/deployment-engineer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/deployment-engineer.md

.opencode/agent/doc-updater.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/doc-updater.md

.opencode/agent/e2e-runner.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/e2e-runner.md

.opencode/agent/golang-pro.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/golang-pro.md

.opencode/agent/implement.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/implement.md

.opencode/agent/incident-responder.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/incident-responder.md

.opencode/agent/investigate.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/investigate.md

.opencode/agent/mobile-developer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/mobile-developer.md

.opencode/agent/planner.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/planner.md

.opencode/agent/provider-eval.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/provider-eval.md

.opencode/agent/python-pro.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/python-pro.md

.opencode/agent/refactor-cleaner.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/refactor-cleaner.md

.opencode/agent/review.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/review.md

.opencode/agent/security-engineer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/security-engineer.md

.opencode/agent/security-reviewer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/security-reviewer.md

.opencode/agent/security.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/security.md

.opencode/agent/ship.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/ship.md

.opencode/agent/sql-pro.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/sql-pro.md

.opencode/agent/swift-expert.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/swift-expert.md

.opencode/agent/tdd-guide.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/tdd-guide.md

.opencode/agent/technical-writer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/technical-writer.md

.opencode/agent/terraform-engineer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/terraform-engineer.md

.opencode/agent/test-runner.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/test-runner.md

.opencode/agent/typescript-pro.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/typescript-pro.md

.opencode/agent/websocket-engineer.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/agents/websocket-engineer.md

.opencode/command/auto.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/auto.md

.opencode/command/blog.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/blog.md

.opencode/command/bugfix.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/bugfix.md

.opencode/command/build-fix.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/build-fix.md

.opencode/command/code-review.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/code-review.md

.opencode/command/delegate.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/delegate.md

.opencode/command/e2e.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/e2e.md

.opencode/command/explain-project.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/explain-project.md

.opencode/command/gemini.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/gemini.md

.opencode/command/handoff.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/handoff.md

.opencode/command/implement.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/implement.md

.opencode/command/investigate.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/investigate.md

.opencode/command/plan-to-checklist.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/plan-to-checklist.md

.opencode/command/plan.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/plan.md

.opencode/command/provider-eval.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/provider-eval.md

.opencode/command/refactor-clean.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/refactor-clean.md

.opencode/command/review.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/review.md

.opencode/command/ship.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/ship.md

.opencode/command/tdd.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/tdd.md

.opencode/command/test-coverage.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/test-coverage.md

.opencode/command/test-report.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/test-report.md

.opencode/command/test.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/test.md

.opencode/command/ui-skills.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/ui-skills.md

.opencode/command/update-codemaps.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/update-codemaps.md

.opencode/command/update-docs.md

@@ -0,0 +1 @@
+../../packages/guardrails/profile/commands/update-docs.md

.opencode/opencode.jsonc

@@ -118,20 +118,16 @@
     "external_directory": "ask",
   },
   "mcp": {},
-  "hooks": {
-    "PreToolUse": [
-      {
-        "command": ".opencode/hooks/guardrails.sh",
-        "matcher": "bash",
-      },
-    ],
-  },
   "tools": {
     "github-triage": false,
     "github-pr-search": false,
   },
   "hooks": {
     "PreToolUse": [
+      {
+        "command": ".opencode/hooks/guardrails.sh",
+        "matcher": "bash",
+      },
       {
         "command": ".opencode/hooks/enforce-factcheck-before-edit.sh",
         "matcher": "write",

FORK.md

@@ -0,0 +1,46 @@
+# Cor-Incorporated/opencode Fork
+
+Upstream: [anomalyco/opencode](https://github.com/anomalyco/opencode)
+
+## Fork-Only Systems
+
+These features exist only in this fork, not in upstream:
+
+| System | Path | Purpose |
+|--------|------|---------|
+| Shell Hook System | `packages/opencode/src/hook/` | PreToolUse/PostToolUse shell script hooks |
+| Memory Extractor | `packages/opencode/src/memory/` | Session-based learning persistence |
+| Guardrails Plugin | `packages/guardrails/` | Git workflow gates, auto-review, team orchestration |
+| Notification | `packages/opencode/src/notification/` | Desktop notifications on session events |
+| Repetition Detection | `packages/opencode/src/session/repetition.ts` | LLM loop detection |
+| GLM Prompt | `packages/opencode/src/session/prompt/glm.txt` | ZhipuAI GLM provider support |
+| AI Guardrails Docs | `docs/ai-guardrails/` | ADRs, issues, migration docs |
+
+## Upstream Sync
+
+Upstream merge is automated via `.gitattributes` `merge=ours` driver.
+Fork-only paths are auto-protected during merge.
+
+```bash
+# One-time setup
+git config merge.ours.driver true
+
+# Sync
+./scripts/upstream-sync.sh
+```
+
+### Conflict-Risk Files
+
+These files are modified in both fork and upstream. Manual conflict resolution may be needed:
+
+- `packages/opencode/src/config/config.ts` — fork adds hook/memory config
+- `packages/opencode/src/index.ts` — fork adds hook/memory imports
+- `packages/opencode/src/plugin/index.ts` — fork modifies plugin loading
+- `packages/opencode/src/session/processor.ts` — fork adds memory extraction
+- `packages/opencode/src/session/prompt.ts` — fork adds hook injection
+
+## Sync History
+
+| Date | Upstream Ref | Commits | Notes |
+|------|-------------|---------|-------|
+| 2026-04-08 | v1.4.0 | 37 | PR #136. Instance→InstanceState fix |