diff --git a/examples/acp-agent/tests/snapshots/goal-session/input.json b/examples/acp-agent/tests/goal-snapshots/goal-session/input.json
similarity index 100%
rename from examples/acp-agent/tests/snapshots/goal-session/input.json
rename to examples/acp-agent/tests/goal-snapshots/goal-session/input.json
diff --git a/examples/acp-agent/tests/snapshots/goal-session/replay.override.json b/examples/acp-agent/tests/goal-snapshots/goal-session/replay.override.json
similarity index 100%
rename from examples/acp-agent/tests/snapshots/goal-session/replay.override.json
rename to examples/acp-agent/tests/goal-snapshots/goal-session/replay.override.json
diff --git a/examples/acp-agent/tests/snapshots/goal-session/session.expected.jsonl b/examples/acp-agent/tests/goal-snapshots/goal-session/session.expected.jsonl
similarity index 100%
rename from examples/acp-agent/tests/snapshots/goal-session/session.expected.jsonl
rename to examples/acp-agent/tests/goal-snapshots/goal-session/session.expected.jsonl
diff --git a/examples/acp-agent/tests/snapshots/goal-session/session.jsonl b/examples/acp-agent/tests/goal-snapshots/goal-session/session.jsonl
similarity index 100%
rename from examples/acp-agent/tests/snapshots/goal-session/session.jsonl
rename to examples/acp-agent/tests/goal-snapshots/goal-session/session.jsonl
diff --git a/examples/acp-agent/tests/snapshots/goal-session/stdout.expected.jsonl b/examples/acp-agent/tests/goal-snapshots/goal-session/stdout.expected.jsonl
similarity index 100%
rename from examples/acp-agent/tests/snapshots/goal-session/stdout.expected.jsonl
rename to examples/acp-agent/tests/goal-snapshots/goal-session/stdout.expected.jsonl
diff --git a/examples/acp-agent/tests/goal.snapshot.ts b/examples/acp-agent/tests/goal.snapshot.ts
index 440eb66de6..42e3041721 100644
--- a/examples/acp-agent/tests/goal.snapshot.ts
+++ b/examples/acp-agent/tests/goal.snapshot.ts
@@ -14,7 +14,9 @@ import { foldGoal } from '@deepseek-ai/dsh-goal'
 import type { SessionEvent } from '@deepseek-ai/dsh-session'
 import { describe, expect, it } from 'vitest'
 
-const scenarioDir = join(dirname(fileURLToPath(import.meta.url)), 'snapshots/goal-session')
+// This lifecycle proof has goal-specific timestamp normalization and semantic
+// assertions, so it owns a separate snapshot root from the generic ACP suite.
+const scenarioDir = join(dirname(fileURLToPath(import.meta.url)), 'goal-snapshots/goal-session')
 const fixtureFile = join(scenarioDir, 'session.jsonl')
 const overrideFile = join(scenarioDir, 'replay.override.json')
 const stdoutExpected = join(scenarioDir, 'stdout.expected.jsonl')
diff --git a/knip.json b/knip.json
index c5d99a0d89..0b2650fe19 100644
--- a/knip.json
+++ b/knip.json
@@ -72,11 +72,11 @@
       "project": ["src/**/*.ts", "tests/**/*.ts"]
     },
     "packages/goal/goal-session": {
-      "entry": ["tests/**/*.spec.ts", "tests/**/*.e2e.ts"],
+      "entry": ["tests/**/*.spec.ts"],
       "project": ["src/**/*.ts", "tests/**/*.ts"]
     },
     "packages/goal/tool-goal": {
-      "entry": ["tests/**/*.spec.ts", "tests/**/*.e2e.ts"],
+      "entry": ["tests/**/*.spec.ts"],
       "project": ["src/**/*.ts", "tests/**/*.ts"]
     },
     "packages/code-runtime/code-runtime-worker": {
diff --git a/packages/goal/goal-session/package.json b/packages/goal/goal-session/package.json
index c1493d017c..48a77019a3 100644
--- a/packages/goal/goal-session/package.json
+++ b/packages/goal/goal-session/package.json
@@ -34,7 +34,6 @@
     "@deepseek-ai/dsh-agent-loop-testkit": "workspace:^",
     "@deepseek-ai/dsh-goal": "workspace:^",
     "@deepseek-ai/dsh-llm": "workspace:^",
-    "@deepseek-ai/dsh-loader-smoke": "workspace:^",
     "@deepseek-ai/dsh-session": "workspace:^",
     "@deepseek-ai/dsh-system-prompt": "workspace:^",
     "@deepseek-ai/dsh-tools": "workspace:^",
diff --git a/packages/goal/tool-goal/package.json b/packages/goal/tool-goal/package.json
index 28cd6839f8..b9b4912cf4 100644
--- a/packages/goal/tool-goal/package.json
+++ b/packages/goal/tool-goal/package.json
@@ -38,7 +38,6 @@
     "@deepseek-ai/dsh-agent": "workspace:^",
     "@deepseek-ai/dsh-goal": "workspace:^",
     "@deepseek-ai/dsh-llm": "workspace:^",
-    "@deepseek-ai/dsh-loader-smoke": "workspace:^",
     "@deepseek-ai/dsh-session": "workspace:^",
     "@deepseek-ai/dsh-system-prompt": "workspace:^",
     "@deepseek-ai/dsh-tools": "workspace:^",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 49cd73a6c4..76e3224f2e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -428,9 +428,6 @@ importers:
       '@deepseek-ai/dsh-llm':
         specifier: workspace:^
         version: link:../../llm/llm
-      '@deepseek-ai/dsh-loader-smoke':
-        specifier: workspace:^
-        version: link:../../support/loader-smoke
       '@deepseek-ai/dsh-session':
         specifier: workspace:^
         version: link:../../core/session
@@ -514,6 +511,9 @@ importers:
       '@deepseek-ai/dsh-llm':
         specifier: workspace:^
         version: link:../../llm/llm
+      '@deepseek-ai/dsh-loader-smoke':
+        specifier: workspace:^
+        version: link:../../support/loader-smoke
       '@deepseek-ai/dsh-scope':
         specifier: workspace:^
         version: link:../../core/scope
@@ -1015,9 +1015,6 @@ importers:
       '@deepseek-ai/dsh-llm':
         specifier: workspace:^
         version: link:../../llm/llm
-      '@deepseek-ai/dsh-loader-smoke':
-        specifier: workspace:^
-        version: link:../../support/loader-smoke
       '@deepseek-ai/dsh-scope':
         specifier: workspace:^
         version: link:../../core/scope
@@ -1045,9 +1042,6 @@ importers:
       '@deepseek-ai/dsh-llm':
         specifier: workspace:^
         version: link:../../llm/llm
-      '@deepseek-ai/dsh-loader-smoke':
-        specifier: workspace:^
-        version: link:../../support/loader-smoke
       '@deepseek-ai/dsh-session':
         specifier: workspace:^
         version: link:../../core/session