fix: repair worker guard cwd handling and Codex role wording

Merge PR #41 to close P1 issues #15 and #19.

Author: LiTeXz

.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
 	"name": "devflow-skills",
-	"version": "0.2.11",
+	"version": "0.2.12",
 	"description": "DevFlow engineering workflow skills for Codex: routing, DDD, TDD, planning, execution, debugging, review, verification, and branch finishing.",
 	"composerIcon": "./assets/app-icon-small.svg",
 	"logo": "./assets/app-icon.png",
@@ -24,7 +24,7 @@
 		"websiteURL": "https://github.com/LiTeXz/devflow-skills",
 		"defaultPrompt": [
 			"Use df-engineering-workflow-router to classify this task",
-      "Use `df-publisher`subagent, management this git and github.",
+			"Use the df-publisher Codex worker session for git and GitHub publishing tasks.",
 			"Create a DDD to TDD implementation plan",
 			"Verify this branch before completion"
 		],

.github/workflows/version-check.yml

@@ -77,8 +77,11 @@ jobs:
 
           while IFS= read -r path; do
             mkdir -p "$TMP_DIR/$(dirname "$path")"
-            url="https://raw.githubusercontent.com/${REPO}/${TAG}/${path}"
-            if ! curl --fail --show-error --location "$url" --output "$TMP_DIR/$path"; then
+            url="https://api.github.com/repos/${REPO}/contents/${path}?ref=${TAG}"
+            if ! curl --fail --show-error --location --retry 5 --retry-all-errors --retry-delay 2 \
+              --header "Accept: application/vnd.github.raw" \
+              --header "Authorization: Bearer ${{ github.token }}" \
+              "$url" --output "$TMP_DIR/$path"; then
               echo "::error::Missing managed asset on ${TAG}: ${path}"
               exit 1
             fi

README.md

@@ -1,13 +1,13 @@
 # DevFlow Skills
 
-DevFlow Skills 是一组面向 Codex 和 OpenCode 的工程工作流 skills。它把 DDD、Glue Coding、TDD、计划、执行、调试、评审、验证和分支收尾组织成一套可组合的强制工作流。
+DevFlow Skills 是一组面向 Codex 的工程工作流 skills，并提供 OpenCode 兼容适配。它把 DDD、Glue Coding、TDD、计划、执行、调试、评审、验证和分支收尾组织成一套可组合的强制工作流。
 
 插件还包含一个保护分支 hook：在 `main`、`dev`、`develop`、`devlop`
 等常见集成分支上启动会话时提醒切换新分支；在这些分支上拦截写文件、
 修改索引、提交、重置、依赖安装和直接 push 等污染操作，并提示改用新分支
 和 PR 流程。Codex hook 配置位于 `hooks/hooks.codex.json`，并由
 `.codex-plugin/plugin.json` 声明为插件 companion；OpenCode 本地插件入口位于 `.opencode/plugin/devflow-skills.ts`。
-另有主 Agent 禁写 hook：所有分支上主 Agent 只能协调、审查和验证，代码写入必须交给 worker/subagent 或 OpenCode subagent。
+另有 main Codex session 禁写 hook：所有分支上 main Codex session 只能协调、审查和验证，代码写入必须交给 Codex worker session 或兼容适配器识别的写入会话。
 
 ## 重要：必须开启 Plan 模式
 
@@ -84,7 +84,7 @@ OpenCode 当前按本地 checkout 使用。仓库已提供 `.opencode/plugin/dev
 }
 ```
 
-OpenCode 插件会复用同一套保护规则：主 Agent 禁写、subagent 可在非保护分支写入、保护分支写入拦截、所有 agent 的 `git push` 全局拦截。修改 `opencode.json`、插件或 skills 后，需要退出并重启 OpenCode 才会重新加载。
+OpenCode 插件会复用同一套保护规则：main Codex session 禁写、兼容适配器识别的写入会话可在非保护分支写入、保护分支写入拦截、所有 agent 的 `git push` 全局拦截。修改 `opencode.json`、插件或 skills 后，需要退出并重启 OpenCode 才会重新加载。
 
 ## 技能组合图
 

agents/df-publisher.toml

@@ -1,13 +1,13 @@
-# devflow-version = "0.2.11"
+# devflow-version = "0.2.12"
 name = "df-publisher"
-description = "唯一被授权执行 git 和 gh 命令的子代理。负责提交、推送、PR、合并、发布等全部 git/github 操作。遵守保护分支规则。"
+description = "唯一被授权执行 git 和 gh 命令的 Codex worker session。负责提交、推送、PR、合并、发布等全部 git/github 操作。遵守保护分支规则。"
 nickname_candidates = ["df-publisher", "publisher"]
 
 developer_instructions = """
 ## 角色定义
 
-你是 df-publisher，DevFlow 插件中唯一被授权执行 git 和 gh 命令的子代理。
-所有其他 Agent（主 Agent 和 worker）均被禁止执行任何 git/gh 命令，必须委托给你完成。
+你是 df-publisher，DevFlow 插件中唯一被授权执行 git 和 gh 命令的 Codex worker session。
+所有其他会话（main Codex session 和普通 Codex worker session）均被禁止执行发布类 git/gh 命令，必须委托给你完成。
 
 ## 职责范围
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "devflow-skills",
-	"version": "0.2.11",
+	"version": "0.2.12",
 	"type": "module",
 	"private": true,
 	"scripts": {

scripts/opencode-adapter.test.ts

@@ -50,7 +50,7 @@ describe("OpenCode adapter", () => {
 		});
 
 		expect(decision).not.toBeNull();
-		expect(decision?.reason).toInclude("主 Agent 禁止写入");
+		expect(decision?.reason).toInclude("main Codex session 禁止写入");
 	});
 
 	it("blocks main agent shell writes", () => {
@@ -62,10 +62,10 @@ describe("OpenCode adapter", () => {
 		});
 
 		expect(decision).not.toBeNull();
-		expect(decision?.reason).toInclude("主 Agent 禁止写入");
+		expect(decision?.reason).toInclude("main Codex session 禁止写入");
 	});
 
-	it("allows subagent writes on feature branches", () => {
+	it("allows compatible worker writes on feature branches", () => {
 		expect(
 			shouldBlockOpenCodeToolInput({
 				tool: "write",
@@ -76,7 +76,7 @@ describe("OpenCode adapter", () => {
 		).toBeUndefined();
 	});
 
-	it("blocks subagent writes on protected branches", () => {
+	it("blocks compatible worker writes on protected branches", () => {
 		const decision = shouldBlockOpenCodeToolInput({
 			tool: "write",
 			args: { filePath: "README.md" },

scripts/prevent-git-github-operations.ts

@@ -212,14 +212,14 @@ export function ensureDfPublisherAgent(
 				if (reinstallReason) {
 					return `DevFlow: ${reinstallReason}至 v${expectedVersion}（${dfPublisherToml}）`;
 				}
-				return `DevFlow: df-publisher 子代理定义已更新至 v${expectedVersion}（${dfPublisherToml}）`;
+				return `DevFlow: df-publisher Codex worker session 定义已更新至 v${expectedVersion}（${dfPublisherToml}）`;
 			}
-			return `DevFlow: 已自动安装 df-publisher 子代理定义到 ${dfPublisherToml}`;
+			return `DevFlow: 已自动安装 df-publisher Codex worker session 定义到 ${dfPublisherToml}`;
 		}
 	}
 
 	const lines = [
-		"DevFlow 插件不完整：未找到 df-publisher 子代理定义。",
+		"DevFlow 插件不完整：未找到 df-publisher Codex worker session 定义。",
 		`预期位置：${dfPublisherToml}`,
 	];
 	if (pluginRoot) {
@@ -249,7 +249,7 @@ function invalidSourceMessage(
 	reason: string,
 ): string {
 	return [
-		"DevFlow 插件不完整：df-publisher 子代理源文件无效。",
+		"DevFlow 插件不完整：df-publisher Codex worker session 源文件无效。",
 		`源文件：${sourceToml}`,
 		`原因：${reason}`,
 		`目标位置：${dfPublisherToml}`,
@@ -283,10 +283,10 @@ function writeSessionStartMessage(message: string): void {
 function writeToolBlock(): void {
 	const lines = [
 		"DevFlow 已阻止 git/gh 发布操作。",
-		"原因：仅 df-publisher 子代理可执行 git push、git commit、gh issue、gh pr。",
+		"原因：仅 df-publisher Codex worker session 可执行 git push、git commit、gh issue、gh pr。",
 		"",
-		"主 Agent 和其他 worker 可直接执行简单 git/gh 操作（如切换分支、合并、认证），",
-		"但提交、推送、PR、issue 管理必须委托 df-publisher 子代理完成。",
+		"main Codex session 和普通 Codex worker session 可直接执行简单 git/gh 操作（如切换分支、合并、认证），",
+		"但提交、推送、PR、issue 管理必须委托 df-publisher Codex worker session 完成。",
 	];
 	for (const line of lines) {
 		process.stderr.write(`${line}\n`);

scripts/prevent-main-agent-write.test.ts

@@ -44,6 +44,15 @@ function switchBranch(path: string, branch: string): void {
 	});
 }
 
+function initBranchOnlyRepo(path: string, branch: string): void {
+	mkdirSync(path, { recursive: true });
+	Bun.spawnSync({
+		cmd: ["git", "init", "-b", branch],
+		cwd: path,
+		stdout: "ignore",
+	});
+}
+
 // Set up state path for tests
 let stateFilePath: string;
 const STATE_PATH_ENV = "DEVFLOW_MAIN_AGENT_WRITE_STATE";
@@ -242,8 +251,8 @@ describe("MainAgentWriteGuard", () => {
 		});
 	});
 
-	describe("subagent sessions", () => {
-		it("blocks git push even for registered subagent", () => {
+	describe("Codex worker sessions", () => {
+		it("blocks git push even for registered Codex worker", () => {
 			startSubagent("worker-1");
 			expect(
 				shouldBlockTool(
@@ -268,15 +277,15 @@ describe("MainAgentWriteGuard", () => {
 			).not.toBeNull();
 		});
 
-		it("allows registered subagent write", () => {
+		it("allows registered Codex worker write", () => {
 			startSubagent("worker-1");
 			expect(shouldBlockTool("Write", {}, "worker-1")).toBeUndefined();
 			expect(
 				shouldBlockTool("Bash", { command: "git add README.md" }, "worker-1"),
 			).toBeUndefined();
 		});
 
-		it("blocks after subagent stop", () => {
+		it("blocks after Codex worker stop", () => {
 			startSubagent("worker-1");
 			stopSubagent("worker-1");
 			expect(shouldBlockTool("Write", {}, "worker-1")).not.toBeNull();
@@ -289,7 +298,7 @@ describe("MainAgentWriteGuard", () => {
 			).not.toBeNull();
 		});
 
-		it("multiple subagent sessions do not interfere", () => {
+		it("multiple Codex worker sessions do not interfere", () => {
 			startSubagent("worker-1");
 			startSubagent("worker-2");
 			expect(shouldBlockTool("Write", {}, "worker-1")).toBeUndefined();
@@ -313,7 +322,7 @@ describe("MainAgentWriteGuard", () => {
 			).toBeUndefined();
 		});
 
-		it("allows unregistered shell write when nested agent declares subagent worker context", () => {
+		it("allows unregistered shell write when adapter payload declares writable worker context", () => {
 			expect(
 				shouldBlockTool(
 					"Bash",
@@ -418,8 +427,8 @@ describe("MainAgentWriteGuard", () => {
 		});
 	});
 
-	describe("protected branch write for registered subagent", () => {
-		it("blocks registered subagent write on protected branch via workdir", () => {
+	describe("protected branch write for registered Codex worker", () => {
+		it("blocks registered Codex worker write on protected branch via workdir", () => {
 			startSubagent("worker-1");
 
 			const root = join(tempDir, "pb-root");
@@ -452,6 +461,36 @@ describe("MainAgentWriteGuard", () => {
 			expect(decision?.reason).toInclude("cwd");
 			expect(decision?.reason).toInclude(root);
 		});
+
+		it("uses git -C cwd instead of parent cwd for registered worker git writes", () => {
+			startSubagent("worker-1");
+
+			const root = join(tempDir, "worker-nested-git-c-root");
+			const allowedNested = join(root, "allowed-nested");
+			const blockedNested = join(root, "blocked-nested");
+			initBranchOnlyRepo(root, "dev");
+			initBranchOnlyRepo(allowedNested, "codex/topic");
+			initBranchOnlyRepo(blockedNested, "dev");
+
+			expect(
+				shouldBlockTool(
+					"Bash",
+					{ command: `git -C "${allowedNested}" add README.md` },
+					"worker-1",
+					root,
+				),
+			).toBeUndefined();
+
+			const decision = shouldBlockTool(
+				"Bash",
+				{ command: `git -C "${blockedNested}" add README.md` },
+				"worker-1",
+				root,
+			);
+			expect(decision).not.toBeNull();
+			expect(decision?.reason).toInclude("cwd");
+			expect(decision?.reason).toInclude(blockedNested);
+		});
 	});
 
 	describe("hook manifest", () => {