@hongmaple0820/scale-engine 0.21.0 → 0.21.2

package/dist/workflow/WorkspaceTopology.js

@@ -56,11 +56,7 @@ export function workspaceTopologyTemplate(options = {}) {
                 services: ['example'],
             },
         ],
-        branchPolicy: {
-            protectedBranches: ['main', 'master'],
-            featurePrefixes: ['feature/', 'fix/', 'docs/', 'codex/'],
-            requireAuthorScopeDate: true,
-        },
+        branchPolicy: defaultBranchPolicy(),
         finishPolicy: defaultFinishPolicy(topology),
     };
     return `${JSON.stringify(config, null, 2)}\n`;
@@ -76,7 +72,10 @@ function normalizeWorkspaceTopology(raw, meta) {
         version: raw.version ?? 1,
         topology,
         repositories,
-        branchPolicy: raw.branchPolicy,
+        branchPolicy: {
+            ...defaultBranchPolicy(),
+            ...(raw.branchPolicy ?? {}),
+        },
         finishPolicy: {
             ...defaultFinishPolicy(topology),
             ...(raw.finishPolicy ?? {}),
@@ -119,6 +118,18 @@ function defaultFinishPolicy(topology) {
         requireReviewArtifacts: topology === 'moe',
     };
 }
+function defaultBranchPolicy() {
+    return {
+        mode: 'gitlab-flow',
+        integrationBranch: 'dev',
+        productionBranch: 'master',
+        protectedBranches: ['dev', 'master', 'main'],
+        featurePrefixes: ['feature/', 'feat/', 'fix/', 'chore/', 'docs/', 'codex/'],
+        releasePrefixes: ['release/'],
+        hotfixPrefixes: ['hotfix/'],
+        requireAuthorScopeDate: true,
+    };
+}
 function normalizeRelative(path) {
     return path.replace(/\\/g, '/');
 }

package/dist/workflow/WorkspaceTopology.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkspaceTopology.js","sourceRoot":"","sources":["../../src/workflow/WorkspaceTopology.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkspaceTopology.js","sourceRoot":"","sources":["../../src/workflow/WorkspaceTopology.ts"],"names":[],"mappings":"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"}

package/docs/GITLAB_FLOW.md

@@ -0,0 +1,125 @@
+# GitLab Flow Branch and Worktree Policy
+
+SCALE Engine uses a GitLab Flow variant for this repository:
+
+```text
+feat/* / fix/* / chore/* / docs/* / codex/*
+        -> dev
+        -> master
+        -> vX.Y.Z tag
+        -> npm publish
+
+hotfix:
+        fix forward on dev first when possible
+        -> cherry-pick to hotfix/*
+        -> master
+        -> vX.Y.Z tag
+        -> sync master back to dev
+
+selective release, only when dev contains work that must not ship:
+        master
+        -> release/vX.Y.Z
+        -> cherry-pick selected commits
+        -> master
+        -> vX.Y.Z tag
+        -> sync master back to dev
+```
+
+## Branch Roles
+
+| Branch | Role | Rule |
+| --- | --- | --- |
+| `dev` | Integration and test branch | Merge reviewed short branches here. Do not create direct governed commits on `dev`. |
+| `master` | Production branch | Only verified release/hotfix results land here. Publish from user-created `vX.Y.Z` tags on `master`. |
+| `feat/*`, `feature/*` | Feature branches | Start from current `dev`, merge back to `dev`, then delete. |
+| `fix/*` | Normal bug fix branches | Start from current `dev`, merge back to `dev`, then delete. |
+| `chore/*`, `docs/*`, `codex/*` | Maintenance branches | Short-lived work branches that merge back to `dev`. |
+| `hotfix/*` | Production patch branches | Use only for production fixes. Fix forward to `dev` first when possible, then cherry-pick to hotfix/master. |
+| `release/*` | Selective release branch | Use only when `dev` contains work that must not ship. Start from `master` and cherry-pick the release list. |
+
+## Required Checks
+
+Run the release-grade verification set before merging to `master` or tagging:
+
+```bash
+npm run build
+npx vitest run
+git diff --check
+npm pack --dry-run
+```
+
+Every merge request should run the relevant build/lint/test checks before review is accepted. Do not wait until `master` to discover broken tests.
+
+## Merge and Conflict Rules
+
+- Public branches are not rebased: `dev`, `master`, `release/*`, and `hotfix/*` keep realistic history.
+- Personal short branches may be rebased before merge, but only with `--force-with-lease` and only before review is accepted.
+- Prefer squash merge from short branches into `dev` when one logical change should be easy to revert.
+- Resolve conflicts on the source branch, rerun verification, then merge. Do not resolve release conflicts directly on `master`.
+- Fix bugs forward first: land the fix on `dev` when possible, then cherry-pick the same commit to `hotfix/*` or the selected patch release branch.
+- Commit messages should explain intent and why the chosen path was selected when the decision is not obvious.
+
+## Ship Gate Rules
+
+`scale ship <task-id>` now enforces the branch lifecycle:
+
+- blocked on `dev`, `master`, `main`, and detached HEAD
+- allowed on configured short branches such as `feat/*`, `fix/*`, `chore/*`, `docs/*`, `codex/*`, `release/*`, and `hotfix/*`
+- still requires verification evidence, passing review evidence, and reviewed-file-only staging
+- still blocks dirty or unsafe child repositories in MOE/submodule workspaces
+
+Use:
+
+```bash
+scale workspace status --summary
+scale workspace finish --summary
+scale workspace finish --json
+```
+
+The report includes branch role, whether governed shipping is allowed, and cleanup blockers.
+
+## Worktree Lifecycle
+
+Temporary agent worktrees are safe to remove only when all of these are true:
+
+- root worktree is clean
+- child repositories are clean and pushed when required
+- the temporary branch has no unpushed commits
+- a branch with no upstream is already merged into `dev`/`master`, or it contains no unique work
+
+Cleanup remains dry-run by default:
+
+```bash
+scale workspace cleanup --dir <temporary-worktree> --dry-run --json
+scale workspace cleanup --dir <temporary-worktree> --apply --confirm <branch-or-head> --json
+```
+
+If cleanup is blocked, push the branch, merge it, cherry-pick it into the selected release, or explicitly discard it before removing the worktree.
+
+## Repository Bootstrap
+
+This repository currently treats `dev` as the integration branch and `master` as production. If `dev` falls behind `master` and has no unique commits, fast-forward `dev` to `master` before starting new feature work:
+
+```bash
+git fetch --all --prune
+git switch dev
+git merge --ff-only master
+git push origin dev
+git push github dev
+```
+
+After that, normal work should start from `dev`:
+
+```bash
+git switch dev
+git pull --ff-only origin dev
+git switch -c feat/<short-name>
+```
+
+Before creating a normal release from `dev`, inspect the release delta:
+
+```bash
+git log --oneline master..dev
+```
+
+If every listed commit is intended for the next production release, merge `dev` through the normal release path. If any commit must be excluded, create `release/vX.Y.Z` from `master` and cherry-pick only the approved release list.

package/docs/README.md

@@ -28,6 +28,7 @@
 | [UPGRADE_MANAGEMENT.md](UPGRADE_MANAGEMENT.md) | SCALE CLI、governance pack、skills、MCP 和 CLI 工具的安全升级流程 |
 | [GOVERNANCE_DASHBOARD.md](GOVERNANCE_DASHBOARD.md) | Runtime、eval、memory、resource、HTML artifact 的统一治理面板 |
 | [RELEASE_READINESS.md](RELEASE_READINESS.md) | 发版前质量门槛、官方 demo 和真实项目落地验收 |
+| [GITLAB_FLOW.md](GITLAB_FLOW.md) | GitLab Flow 分支、发版、tag 和临时 worktree 生命周期规范 |
 | [SKILL-REPOSITORY.md](SKILL-REPOSITORY.md) | 受治理 skill repository 和安装安全策略 |
 | [VIBE-TEMPLATES.md](VIBE-TEMPLATES.md) | 可复制的 Vibe Coding 提示词模板 |
 | [LEADERSHIP-PRESETS.md](LEADERSHIP-PRESETS.md) | CEO、CTO、PM、Architect 等内置领导者角色预设 |

package/docs/RESOURCE_GOVERNANCE.md

@@ -0,0 +1,92 @@
+# Resource Governance
+
+SCALE now treats project outputs as governed resources instead of undifferentiated files.
+
+## Problem
+
+Engineering agents generate many useful but noisy assets:
+
+- maintained product and architecture docs
+- task plans and verification notes
+- E2E reports, screenshots, videos, logs, and coverage output
+- temporary scripts and scratch files
+- reusable automation scripts
+- API contracts and ADRs
+
+Without lifecycle rules these files drift, conflict with the real codebase, or get committed to Git when they should be local evidence only.
+
+## Model
+
+`scale assets scan` classifies resources into:
+
+| Type | Default Git policy | Lifecycle |
+| --- | --- | --- |
+| canonical-doc | commit | maintained |
+| decision-record | commit | immutable |
+| contract | commit | maintained |
+| reusable-script | commit | maintained |
+| task-artifact | review | task-scoped |
+| evidence-report | ignore | generated |
+| generated-media | review/external | generated or review-required |
+| temporary | ignore | temporary |
+
+`.scale/resource-policy.json` owns defaults such as owners, module mapping, runtime directories, and maximum Git file size.
+
+`.scale/assets.json` is the explicit catalog for long-lived project assets and source-of-truth declarations.
+Declared source-of-truth assets are checked by `assets doctor`; if the file disappears, the doctor fails. Maintained assets can also declare `lastReviewedAt` and `reviewIntervalDays` so product, architecture, workflow, and standards documents are rechecked against the current implementation instead of drifting silently:
+
+```json
+{
+  "assets": [
+    {
+      "path": "docs/modules/auth/architecture.md",
+      "type": "canonical-doc",
+      "owner": "auth-team",
+      "module": "auth",
+      "sourceOfTruth": true,
+      "lifecycle": "maintained",
+      "gitPolicy": "commit",
+      "lastReviewedAt": "2026-05-15",
+      "reviewIntervalDays": 90
+    }
+  ]
+}
+```
+
+## Commands
+
+```bash
+scale assets scan --json
+scale assets doctor --json
+scale assets settle --task-id <task-id> --artifact-dir .planning/tasks/<task>
+scale init --governance-pack resource-governance
+```
+
+`assets doctor` fails when runtime evidence or external media is already tracked by Git, or when a declared source-of-truth asset is missing. It warns on large tracked files, expired temporary outputs, ownerless canonical documentation, missing non-source catalog entries, and stale maintained assets.
+
+`assets settle` runs the same checks and appends a settlement section to `resource-impact.md` when a task artifact directory is provided.
+
+## Finish Rule
+
+Before finishing M/L/CRITICAL work:
+
+1. Promote final product, API, or architecture truth into maintained docs.
+2. Keep task-scoped planning, runtime contracts, reality checks, cleanup notes, raw reports, logs, screenshots, videos, and scratch scripts out of long-lived `docs/` unless deliberately promoted.
+3. Run `scale assets scan --json`.
+4. Run `scale assets doctor --json`.
+5. Run `scale assets settle --task-id <task-id> --artifact-dir <task-dir>`.
+6. Delete or archive temporary resources that are no longer needed.
+
+## Task Artifact Boundary
+
+New SCALE task artifacts default to `.planning/tasks/<task>/`, not `docs/worklog/tasks/<task>/`.
+
+Every M/L/CRITICAL task should keep these three evidence files alongside the normal explore/plan/verification/review/summary set:
+
+| File | Purpose |
+| --- | --- |
+| `runtime.md` | Records configuration source, topology, auth mode, and verification boundary. |
+| `reality-check.md` | Separates confirmed behavior from not verified, stub/partial, credential-gated, and environment-gated claims. |
+| `resource-cleanup.md` | Records which outputs stay task-scoped, which are promoted, and which should be deleted or archived. |
+
+`docs/worklog/tasks/` remains a legacy-recognized task-artifact location for existing projects, but generated guidance now points new work to `.planning/tasks/`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hongmaple0820/scale-engine",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "Executable AI agent governance with workflow gates, evidence, skill/tool orchestration, and traceable HTML artifacts",
   "type": "module",
   "bin": {
@@ -23,8 +23,10 @@
     "docs/SKILL_RADAR.md",
     "docs/MEMORY_BRAIN.md",
     "docs/GOVERNANCE_DASHBOARD.md",
+    "docs/GITLAB_FLOW.md",
     "docs/MEMORY_FABRIC.md",
     "docs/RUNTIME_EVIDENCE.md",
+    "docs/RESOURCE_GOVERNANCE.md",
     "docs/start",
     "examples/demo-projects/agent-governance-demo"
   ],