merge: integrate sincode-loop-system-restored branch

Resolved conflicts by keeping main branch versions for shared files.

Author: SIN CI

CHANGELOG.md

@@ -534,6 +534,25 @@ reports them; `debt check` gates them.
   rendering drift breaks the build (the prerequisite for issue #168's
   ledger-level token-cost hashing).
 
+### Added — SinCode Loop System (always-on Definition-of-Done baseline)
+- **Baseline DoD** (`internal/goalcontract/baseline.go`): an always-on
+  Definition-of-Done that is merged into every resolved contract so the
+  "self-evident" follow-through work is implicit for every goal — the user
+  never has to ask an agent to write tests, debug, remove scaffolding, or
+  update docs again. It adds deterministic predicate checks (tests touched in
+  the diff, `CHANGELOG.md` touched, a `.doc.md` CoDoc beside each changed Go
+  file) plus LLM-judged semantic criteria (tests cover new behavior, no debug
+  leftovers, goal fully addressed, README/CHANGELOG/AGENTS/MASTER_TODO/CoDocs
+  kept in sync). Additive and deduped against auto-detected/explicit criteria.
+- **DoD preamble injection** (`agentloop.Loop.Preamble` + `goalcontract.Preamble`):
+  the loop now states the rubric to the worker up front via `loopbuilder`, so
+  tests/debug/docs/completeness are handled on the first pass instead of after
+  a stop-gate rejection. Advisory only; the stop-gate still enforces.
+- **Always-on, globally escapable**: baseline is ON by default in `daemon` and
+  `auto run`; disable per-invocation with `--no-baseline` or globally with
+  `SIN_BASELINE=off` (`goalcontract.BaselineEnabled`). Fail-open: predicate
+  scripts exit 0 outside a git repo so they never wedge a non-repo workspace.
+
 ### Added — Loop Engineering (decoupled completion authority)
 ### Added — MCP tool-manifest compression (issue #173, v3.19.0)
 - **`internal/mcpcompress/`** — ponytail-tag compressor for

MASTER_TODO.md

@@ -144,3 +144,26 @@
 ---
 
 *Last updated: 2026-06-02*
+
+---
+
+## SinCode Loop System — always-on Definition-of-Done (2026-06-16)
+
+- [x] Baseline DoD module (`internal/goalcontract/baseline.go`) — deterministic
+  predicate checks (tests touched, CHANGELOG touched, `.doc.md` CoDoc per changed
+  Go file) + semantic criteria (tests cover new behavior, no debug leftovers,
+  goal fully addressed, docs in sync).
+- [x] Additive, deduped merge into `goalcontract.Resolve` via `IncludeBaseline`.
+- [x] DoD preamble injected into the worker prompt (`goalcontract.Preamble` →
+  `agentloop.Loop.Preamble`, wired in `loopbuilder.Build`).
+- [x] ON by default in `daemon` and `auto run`; `--no-baseline` / `SIN_BASELINE=off`.
+- [x] Tests: `baseline_test.go` (23 cases incl. real-git predicate execution) +
+  `loop_preamble_test.go`. Docs synced: CHANGELOG, AGENTS.md, CoDocs, this file.
+
+### Follow-ups / backlog
+- [ ] Extend baseline predicates beyond Go (per-language test-file detection).
+- [ ] Make the CoDoc/CHANGELOG predicates configurable per repo (opt-out subsets).
+- [ ] Apply the baseline to interactive surfaces (swarm/serve) once they gain a
+  completion gate.
+
+*Loop-system update: 2026-06-16*

README.md

@@ -69,6 +69,8 @@ swarm mode, skill bootstrapping, and methodology skills.
 
 **Bounded Autonomy (v3.5.0):** Goal queue + cron/file triggers + skill-lifecycle manager + autonomous daemon. Three hard safety invariants: no gate → no daemon; headless → ask=deny; budget exhausted → hook summons the human.
 
+**SinCode Loop System (always-on Definition-of-Done):** Every goal automatically carries the "self-evident" follow-through — write tests, debug, remove scaffolding, finish the job, and keep `README`/`CHANGELOG`/`AGENTS.md`/`MASTER_TODO`/`.doc.md` CoDocs in sync — so you never have to tell an agent to do that work again. The baseline is merged into every contract, stated to the worker up front, and enforced by the independent stop-gate. ON by default in `daemon` and `auto run`; escape with `--no-baseline` or `SIN_BASELINE=off`.
+
 **Self-Extending (v3.4.0+):** `sin_bootstrap_skill` writes Python MCP servers from natural-language specs, tests them, and deploys them on the fly (defense-in-depth: requires `SIN_ALLOW_BOOTSTRAP=1`).
 
 **Time-Travel Debugging:** Fork any session at any turn to explore parallel solution paths (`sin-code session fork <id> <turn>`).

cmd/sin-code/auto_cmd.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/agentloop"
 	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/autopilot"
+	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/goalcontract"
 	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/lessons"
 	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/loopbuilder"
 	"github.com/OpenSIN-Code/SIN-Code/cmd/sin-code/internal/mcpclient"
@@ -62,6 +63,7 @@ func newAutoInitCmd() *cobra.Command {
 func newAutoRunCmd() *cobra.Command {
 	var verifyCmd string
 	var budgetMinutes, maxExperiments, maxTurns int
+	var noBaseline bool
 	cmd := &cobra.Command{
 		Use:   "run",
 		Short: "Run the autonomous loop until the budget is exhausted",
@@ -104,6 +106,22 @@ func newAutoRunCmd() *cobra.Command {
 			}
 			defer sessStore.Close()
 
+			// Resolve the always-on SinCode loop Definition-of-Done once for
+			// the whole autonomous session: every experiment the autopilot
+			// runs is held to the same baseline (tests/debug/docs/completeness)
+			// via the stop-gate, unless --no-baseline / SIN_BASELINE=off.
+			var autoContract *goalcontract.GoalContract
+			if c, cerr := goalcontract.Resolve(goalcontract.ResolveOptions{
+				Workspace:       workspace,
+				VerifyCmd:       verifyCmd,
+				AutoDetect:      true,
+				IncludeBaseline: goalcontract.BaselineEnabled(noBaseline),
+			}); cerr != nil {
+				fmt.Fprintf(cmd.ErrOrStderr(), "warn: auto contract resolve failed, continuing without stop-gate: %v\n", cerr)
+			} else if !c.IsEmpty() {
+				autoContract = c
+			}
+
 			runGoal := func(ctx context.Context, goal string) (autopilot.LoopResult, string, error) {
 				sess, err := sessStore.StartOrResume("")
 				if err != nil {
@@ -116,6 +134,7 @@ func newAutoRunCmd() *cobra.Command {
 					VerifyMode: "poc",
 					VerifyCmd:  verifyCmd,
 					Headless:   true,
+					Contract:   autoContract,
 					ToolFactory: func(mgr *mcpclient.Manager) (agentloop.LocalToolFunc, []agentloop.ToolSpec) {
 						return combinedTool(workspace, mgr), combinedSpecs(mgr)
 					},
@@ -171,6 +190,7 @@ func newAutoRunCmd() *cobra.Command {
 	cmd.Flags().IntVar(&budgetMinutes, "budget-minutes", 0, "wall-clock budget (overrides program.md)")
 	cmd.Flags().IntVar(&maxExperiments, "max-experiments", 0, "experiment cap (overrides program.md)")
 	cmd.Flags().IntVar(&maxTurns, "max-turns", 60, "max agent turns per experiment")
+	cmd.Flags().BoolVar(&noBaseline, "no-baseline", false, "disable the always-on SinCode loop baseline (tests/debug/docs/completeness DoD); also via SIN_BASELINE=off")
 	return cmd
 }
 

cmd/sin-code/internal/automem_cmd_test.go

@@ -18,11 +18,14 @@ func TestOpenAutoMem_Success(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	s, proj, err := openAutoMem()
@@ -103,11 +106,14 @@ func TestAutoMem_ListCmd(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	out, err := captureAutoMemCmd(t, memAutoListCmd, []string{})
@@ -123,13 +129,16 @@ func TestAutoMem_ListCmdJSON(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	oldFormat := autoMemFormat
 	autoMemFormat = "json"
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 		autoMemFormat = oldFormat
 	}()
 
@@ -146,11 +155,14 @@ func TestAutoMem_ShowCmd(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	store, _, err := openAutoMem()
@@ -174,11 +186,14 @@ func TestAutoMem_AppendCmd(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	out, err := captureAutoMemCmd(t, memAutoAppendCmd, []string{"heading", "body"})
@@ -194,11 +209,14 @@ func TestAutoMem_RmCmd(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	store, _, err := openAutoMem()
@@ -222,11 +240,14 @@ func TestAutoMem_GcCmd(t *testing.T) {
 	tmpDir := t.TempDir()
 	oldHome := autoMemDefaultHome
 	oldOpen := autoMemOpen
+	oldProject := autoMemProject
 	autoMemDefaultHome = func() (string, error) { return tmpDir, nil }
 	autoMemOpen = auto_mem.Open
+	autoMemProject = ""
 	defer func() {
 		autoMemDefaultHome = oldHome
 		autoMemOpen = oldOpen
+		autoMemProject = oldProject
 	}()
 
 	out, err := captureAutoMemCmd(t, memAutoGcCmd, []string{})

cmd/sin-code/internal/serve_coverage_test.go

@@ -445,6 +445,7 @@ func TestPrintCompressionStats(t *testing.T) {
 	p := mcpcompress.All()
 	stats := []mcpcompress.Stats{
 		{Name: "sin_test", Original: 100, Compressed: 80, BytesSaved: 20, Ratio: 0.2},
+		{Name: "sin_negative", Original: 50, Compressed: 60, BytesSaved: -10, Ratio: -0.2},
 	}
 	printCompressionStats(f, p, stats)