guardian-framework 0.1.70 → 0.1.72

package/dist/cli.js

@@ -3197,7 +3197,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.70", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.72", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {

package/dist/exports.js

@@ -1982,7 +1982,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.70", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.72", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "guardian-framework",
-	"version": "0.1.70",
+	"version": "0.1.72",
 	"description": "Token-optimized agentic framework scaffolder with pi-first architecture",
 	"type": "module",
 	"main": "dist/exports.js",

package/templates/pi/extensions/architect-lib/generators.ts

@@ -7,11 +7,16 @@ export function generateIssueMarkdown(
 	slice: ArchitectureSlice,
 	issueIndex: number,
 	totalIssues: number,
+	tdd?: boolean,
 ): string {
 	const moduleId = slice.module.replace(/^module-/, "");
 	const componentName = component.name.toLowerCase().replace(/\s+/g, "-");
 	const issueId = `ISSUE-${moduleId.toUpperCase()}-${issueIndex + 1}`;
 
+	const testLine = tdd
+		? `    - "update: tests/unit/${moduleId}/${componentName}/ (failing tests already generated — make them pass)"`
+		: `    - "create: tests/unit/${moduleId}/${componentName}/"`;
+
 	return `---
 guardian_issue:
   id: "${issueId}"
@@ -70,7 +75,7 @@ ${component.dependencies.map((d) => `    - "${d}"`).join("\n")}
     - "modify: src/${moduleId}/application/"
     - "modify: src/${moduleId}/infrastructure/"
     - "modify: src/${moduleId}/interfaces/"
-    - "create: tests/unit/${moduleId}/${componentName}/"
+    - ${testLine}
     - "create: tests/integration/${moduleId}/${componentName}/"
 ---
 

package/templates/pi/extensions/architect-lib/helpers.ts

@@ -161,8 +161,16 @@ export function ensureRemoteRepo(
 		`glab repo create "${repository}" --private --description "Epic: ${epicName}" 2>&1`,
 	);
 	if (createResult.exitCode !== 0) {
-		console.warn(`Failed to create GitLab project: ${createResult.stdout}`);
-		return "";
+		// Repo may already exist — verify via API before giving up
+		const viewResult = runScript(
+			cwd,
+			`glab api "projects/${repository}" --method GET 2>/dev/null | jq -r '.id // empty'`,
+		);
+		if (viewResult.exitCode !== 0 || !viewResult.stdout.trim()) {
+			console.warn(`Failed to create or find GitLab project: ${createResult.stdout}`);
+			return "";
+		}
+		console.warn(`GitLab project already exists, connecting to it.`);
 	}
 	runScript(cwd, "git remote remove origin 2>/dev/null");
 	const httpsUrl = `${glabBaseUrl}/${repository}.git`;

package/templates/pi/extensions/architect.ts

@@ -147,6 +147,14 @@ class EpicManager {
 
 		ctx.ui.setStatus("architect", `Planning epic: ${name}`);
 
+		// Ensure git repo is initialized before any remote operations
+		const gitCheck = runScript(this.cwd, "git rev-parse --git-dir 2>/dev/null");
+		if (gitCheck.exitCode !== 0) {
+			runScript(this.cwd, "git init");
+			runScript(this.cwd, "git add .");
+			runScript(this.cwd, 'git commit -m "Initial Guardian scaffold"');
+		}
+
 		const repoTool = readRepoTool(this.cwd);
 		const repository = readRepository(this.cwd);
 		const targetRepo = repository || slice.module;
@@ -159,18 +167,11 @@ class EpicManager {
 				repoTool === "glab" ? "glab auth status 2>/dev/null" : "gh auth status 2>/dev/null",
 			);
 			if (authCheck.exitCode === 0) {
-				// Verify project-level access, not just global auth
-				const projectAccessCheck = repository ? runScript(
-					this.cwd,
-					repoTool === "glab"
-						? `glab api "projects/${repository}" --method GET 2>/dev/null | jq -r '.id // empty'`
-						: `gh api "repos/${repository}" --method GET 2>/dev/null | jq -r '.id // empty'`,
-				) : { exitCode: 0, stdout: "" };
-
-				if (projectAccessCheck.exitCode === 0 && projectAccessCheck.stdout.trim().length > 0) {
-					remoteRepo = ensureRemoteRepo(this.cwd, targetRepo, name, repoTool);
-					hasRemote = remoteRepo.length > 0;
-				}
+				// Try to ensure remote repo — ensureRemoteRepo handles both:
+				// - existing repos: configures local origin
+				// - nonexistent repos: creates remote repo via gh/glab CLI
+				remoteRepo = ensureRemoteRepo(this.cwd, targetRepo, name, repoTool);
+				hasRemote = remoteRepo.length > 0;
 			}
 		}
 
@@ -250,7 +251,7 @@ class EpicManager {
 				status: "planned" as string,
 				remoteIssueId: null as string | null,
 			};
-			const md = generateIssueMarkdown(comp, slice, i, slice.nextLogicalSlice.length);
+			const md = generateIssueMarkdown(comp, slice, i, slice.nextLogicalSlice.length, tdd);
 			writeFileSync(join(issuesDir, `${id}.md`), md);
 			if (hasRemote && remoteRepo) {
 				const result = createRemoteIssue(this.cwd, entry.title, join(issuesDir, `${id}.md`), "epic,implementation", remoteRepo);
@@ -757,15 +758,7 @@ export default function (pi: ExtensionAPI) {
 					return;
 				}
 
-				// Initialize git if needed
-				try {
-					const gitCheck = runScript(ctx.cwd, "git rev-parse --git-dir 2>/dev/null");
-					if (gitCheck.exitCode !== 0) {
-						runScript(ctx.cwd, "git init");
-						runScript(ctx.cwd, "git add .");
-						runScript(ctx.cwd, 'git commit -m "Initial Guardian scaffold"');
-					}
-				} catch { /* ignore */ }
+
 
 				// Remove stale pipeline state so the new one takes effect
 				try {

package/templates/pi/extensions/pipeline.ts

@@ -20,7 +20,7 @@
  *   /pipeline abort               Kill pipeline
  */
 
-import { execSync } from "node:child_process";
+import { execFileSync, execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import {
@@ -863,14 +863,71 @@ export default function (pi: ExtensionAPI) {
 			const prevItemIndex = state.currentItemIndex;
 			const prevStepIndex = state.currentStepIndex;
 			const stepName = (params.stepName as string) || state.steps[prevStepIndex]?.name;
+
+			// Verify current step before advancing (unless user explicitly provides the step name,
+			// which counts as manual confirmation)
+			if (!params.stepName) {
+				const verification = manager.verifyCurrentStep();
+				if (!verification.verified) {
+					return {
+						content: [{ type: "text" as const, text: `Cannot advance: ${verification.reason}` }],
+					};
+				}
+			}
+
 			manager.markStepPassed(stepName);
 			manager.advanceStep();
 
 			// Re-read state after advance
 			const updatedState = manager.getState()!;
 
+			// Non-blocking: sync progress to tracking issue if one exists
+			try {
+				const trackingStatePath = join(ctx.cwd, ".pi/.guardian-epic-state.json");
+				if (existsSync(trackingStatePath)) {
+					const trackingState = JSON.parse(readFileSync(trackingStatePath, "utf-8")) as {
+						trackingIssueId?: string | null;
+						issues?: { id: string; title: string; status: string }[];
+					};
+					if (trackingState.trackingIssueId && !trackingState.trackingIssueId.startsWith("local:")) {
+						const stepNote = stepName
+							? `✓ Step "${stepName}" complete for item "${updatedState.items[prevItemIndex]}"`
+							: `✓ Advanced to item ${updatedState.currentItemIndex + 1}/${updatedState.items.length}: "${updatedState.items[updatedState.currentItemIndex]}"`;
+						const updateScript = join(ctx.cwd, ".pi/scripts/git/update-tracking-issue.sh");
+						if (existsSync(updateScript)) {
+							execFileSync("bash", [updateScript, "--id", trackingState.trackingIssueId, "--comment", stepNote], {
+								cwd: ctx.cwd,
+								timeout: 30_000,
+								encoding: "utf-8",
+								stdio: "ignore",
+							});
+						}
+					}
+				}
+			} catch { /* non-blocking — don't fail the pipeline */ }
+
 			// Pipeline complete
 			if (updatedState.currentItemIndex >= updatedState.items.length) {
+				// Non-blocking: close tracking issue and epic on pipeline completion
+				try {
+					const epicStatePath = join(ctx.cwd, ".pi/.guardian-epic-state.json");
+					if (existsSync(epicStatePath)) {
+						const epicState = JSON.parse(readFileSync(epicStatePath, "utf-8")) as {
+							trackingIssueId?: string | null;
+							epicId?: string | null;
+						};
+						if (epicState.trackingIssueId && !epicState.trackingIssueId.startsWith("local:")) {
+							const closeEpicScript = join(ctx.cwd, ".pi/scripts/git/close-epic.sh");
+							if (existsSync(closeEpicScript)) {
+								const args: string[] = [closeEpicScript, "--tracking-id", epicState.trackingIssueId];
+								if (epicState.epicId) args.push("--epic-id", epicState.epicId);
+								execFileSync("bash", args, {
+									cwd: ctx.cwd, timeout: 30_000, encoding: "utf-8", stdio: "ignore",
+								});
+							}
+						}
+					}
+				} catch { /* non-blocking */ }
 				return {
 					content: [{
 						type: "text" as const,
@@ -884,6 +941,30 @@ export default function (pi: ExtensionAPI) {
 			const movedToNextItem = updatedState.currentItemIndex !== prevItemIndex;
 
 			// If we moved to a new item (completed all steps of previous item),
+			// close its remote issue
+			if (movedToNextItem) {
+				// Close remote issue for the completed item
+				try {
+					const epicStatePath = join(ctx.cwd, ".pi/.guardian-epic-state.json");
+					if (existsSync(epicStatePath)) {
+						const epicState = JSON.parse(readFileSync(epicStatePath, "utf-8")) as {
+							issues?: { id: string; remoteIssueId?: string | null }[];
+						};
+						const prevItemId = updatedState.items[prevItemIndex];
+						const prevIssue = epicState.issues?.find((i) => i.id === prevItemId);
+						if (prevIssue?.remoteIssueId) {
+							const closeScript = join(ctx.cwd, ".pi/scripts/git/close-issue.sh");
+							if (existsSync(closeScript)) {
+								execFileSync("bash", [closeScript, "--id", prevIssue.remoteIssueId], {
+									cwd: ctx.cwd, timeout: 30_000, encoding: "utf-8", stdio: "ignore",
+								});
+							}
+						}
+					}
+				} catch { /* non-blocking */ }
+			}
+
+			// If we moved to a new item and the next step is implement,
 			// inject the full next-task prompt with issue context
 			if (movedToNextItem && currentStep?.name === "implement") {
 				// Find the remote issue ID from epic state

package/templates/pi/preflight_report.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2026-07-13T11:07:34Z",
+  "timestamp": "2026-07-13T11:41:49Z",
   "mode": "all",
   "stages_run": [],
   "summary": {

package/templates/pi/scripts/create-mr.sh

@@ -56,7 +56,7 @@ if [[ "$PLATFORM" == "none" ]]; then
 fi
 
 # Determine branch name from issue ID
-BRANCH_NAME="feature/${ISSUE_ID}"
+BRANCH_NAME="feat/${ISSUE_ID}"
 
 # Ensure we're on the main branch before creating feature branch
 git checkout -b "$BRANCH_NAME" 2>/dev/null || git checkout "$BRANCH_NAME" 2>/dev/null || true

package/templates/pi/scripts/git/close-epic.sh

@@ -6,7 +6,8 @@
 # Usage: bash .pi/scripts/git/close-epic.sh \
 #   --epic-id 101 \
 #   --tracking-id 100 \
-#   --comment "Epic complete. All 5 issues done."
+#   --comment "Epic complete. All 5 issues done." \
+#   [--repo "group/project"]
 
 set -euo pipefail
 
@@ -22,44 +23,63 @@ detect_platform() {
     else echo "none"; fi
 }
 
+read_repository() {
+    if [ -f "guardian-manifest.json" ]; then
+        jq -r '.repository // (.templateContext.repository // "")' guardian-manifest.json 2>/dev/null || echo ""
+    else
+        echo ""
+    fi
+}
+
 EPIC_ID=""
 TRACKING_ID=""
 COMMENT="Epic complete."
+REPO=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
         --epic-id) EPIC_ID="$2"; shift 2 ;;
         --tracking-id) TRACKING_ID="$2"; shift 2 ;;
         --comment) COMMENT="$2"; shift 2 ;;
+        --repo) REPO="$2"; shift 2 ;;
         *) shift ;;
     esac
 done
 
 PLATFORM=$(detect_platform)
+[[ -z "$REPO" ]] && REPO=$(read_repository)
 
 if [[ -z "$EPIC_ID" ]]; then
-    echo "Usage: $0 --epic-id <epic_number> [--tracking-id <tracking_id>] [--comment <comment>]"
+    echo "Usage: $0 --epic-id <epic_number> [--tracking-id <tracking_id>] [--comment <comment>] [--repo <repo>]"
     exit 1
 fi
 
 # Close tracking issue first
 if [[ -n "$TRACKING_ID" ]]; then
-    bash "$(dirname "$0")/close-issue.sh" --id "$TRACKING_ID"
+    bash "$(dirname "$0")/close-issue.sh" --id "$TRACKING_ID" ${REPO:+--repo "$REPO"}
 fi
 
 # Close the epic
 case "$PLATFORM" in
     github)
-        gh issue close "$EPIC_ID" 2>/dev/null
+        gh issue close "$EPIC_ID" ${REPO:+--repo "$REPO"} 2>/dev/null
         if [[ -n "$COMMENT" ]]; then
-            gh issue comment "$EPIC_ID" --body "$COMMENT" 2>/dev/null
+            gh issue comment "$EPIC_ID" ${REPO:+--repo "$REPO"} --body "$COMMENT" 2>/dev/null
         fi
         echo "Closed GitHub epic #$EPIC_ID"
         ;;
     gitlab)
-        glab issue update "$EPIC_ID" --state-event close 2>/dev/null
+        # If EPIC_ID looks numeric, use the GitLab Epic API
+        if [[ "$EPIC_ID" =~ ^[0-9]+$ ]]; then
+            # Try epic close first, fallback to issue close
+            glab api --method PUT "epics/$EPIC_ID" --body '{"state_event":"close"}' 2>/dev/null && \
+                echo "Closed GitLab epic #$EPIC_ID" || \
+                glab issue update "$EPIC_ID" --state-event close ${REPO:+--repo "$REPO"} 2>/dev/null
+        else
+            glab issue update "$EPIC_ID" --state-event close ${REPO:+--repo "$REPO"} 2>/dev/null
+        fi
         if [[ -n "$COMMENT" ]]; then
-            glab issue note "$EPIC_ID" --message "$COMMENT" 2>/dev/null
+            glab issue note "$EPIC_ID" ${REPO:+--repo "$REPO"} --message "$COMMENT" 2>/dev/null || true
         fi
         echo "Closed GitLab epic #$EPIC_ID"
         ;;

package/templates/pi/scripts/git/close-issue.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Git Wrapper: Close Issue
 #
-# Usage: bash .pi/scripts/git/close-issue.sh --id 101
+# Usage: bash .pi/scripts/git/close-issue.sh --id 101 [--repo "group/project"]
 
 set -euo pipefail
 
@@ -17,19 +17,31 @@ detect_platform() {
     else echo "none"; fi
 }
 
+read_repository() {
+    if [ -f "guardian-manifest.json" ]; then
+        jq -r '.repository // (.templateContext.repository // "")' guardian-manifest.json 2>/dev/null || echo ""
+    else
+        echo ""
+    fi
+}
+
 ISSUE_ID=""
+REPO=""
+
 while [[ $# -gt 0 ]]; do
     case $1 in
         --id) ISSUE_ID="$2"; shift 2 ;;
+        --repo) REPO="$2"; shift 2 ;;
         *) shift ;;
     esac
 done
 
-[[ -z "$ISSUE_ID" ]] && { echo "Usage: $0 --id <issue_number>"; exit 1; }
+[[ -z "$ISSUE_ID" ]] && { echo "Usage: $0 --id <issue_number> [--repo <repo>]"; exit 1; }
 PLATFORM=$(detect_platform)
+[[ -z "$REPO" ]] && REPO=$(read_repository)
 
 case "$PLATFORM" in
-    github) gh issue close "$ISSUE_ID" 2>/dev/null && echo "Closed GitHub issue #$ISSUE_ID" ;;
-    gitlab) glab issue update "$ISSUE_ID" --state-event close 2>/dev/null && echo "Closed GitLab issue #$ISSUE_ID" ;;
+    github) gh issue close "$ISSUE_ID" ${REPO:+--repo "$REPO"} 2>/dev/null && echo "Closed GitHub issue #$ISSUE_ID" ;;
+    gitlab) glab issue update "$ISSUE_ID" --state-event close ${REPO:+--repo "$REPO"} 2>/dev/null && echo "Closed GitLab issue #$ISSUE_ID" ;;
     *) echo "Local issue #$ISSUE_ID marked as closed (no platform)" ;;
 esac

package/templates/pi/scripts/git/link-issue-to-epic.sh

@@ -3,7 +3,8 @@
 #
 # Usage: bash .pi/scripts/git/link-issue-to-epic.sh \
 #   --issue-id 102 \
-#   --epic-id 101
+#   --epic-id 101 \
+#   [--repo "group/project"]
 
 set -euo pipefail
 
@@ -19,46 +20,53 @@ detect_platform() {
     else echo "none"; fi
 }
 
+read_repository() {
+    if [ -f "guardian-manifest.json" ]; then
+        jq -r '.repository // (.templateContext.repository // "")' guardian-manifest.json 2>/dev/null || echo ""
+    else
+        echo ""
+    fi
+}
+
 ISSUE_ID=""
 EPIC_ID=""
+REPO=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
         --issue-id) ISSUE_ID="$2"; shift 2 ;;
         --epic-id) EPIC_ID="$2"; shift 2 ;;
+        --repo) REPO="$2"; shift 2 ;;
         *) shift ;;
     esac
 done
 
-[[ -z "$ISSUE_ID" || -z "$EPIC_ID" ]] && { echo "Usage: $0 --issue-id <issue> --epic-id <epic>"; exit 1; }
+[[ -z "$ISSUE_ID" || -z "$EPIC_ID" ]] && { echo "Usage: $0 --issue-id <issue> --epic-id <epic> [--repo <repo>]"; exit 1; }
 PLATFORM=$(detect_platform)
+[[ -z "$REPO" ]] && REPO=$(read_repository)
 
 case "$PLATFORM" in
     github)
-        # GitHub uses "closes #N" or "fixes #N" in issue body to link
-        gh issue edit "$ISSUE_ID" --body "$(gh issue view "$ISSUE_ID" --json body -q .body)
+        gh issue edit "$ISSUE_ID" ${REPO:+--repo "$REPO"} --body "$(gh issue view "$ISSUE_ID" --json body -q .body 2>/dev/null || true)
 
 Relates to #$EPIC_ID" 2>/dev/null
         echo "Linked GitHub issue #$ISSUE_ID to #$EPIC_ID"
         ;;
     gitlab)
-        # Use GitLab API to link issue to epic (--milestone is semantically wrong).
+        # GitLab: link issue to epic via API
         # API: POST /groups/:group/epics/:epic_iid/issues/:issue_iid
-        # We derive the group from the project path.
-        if command -v jq &>/dev/null && [[ -n "${CI_PROJECT_ID:-}" || -n "${GITLAB_PROJECT_ID:-}" ]]; then
-            local pid="${CI_PROJECT_ID:-${GITLAB_PROJECT_ID:-}}"
-            glab api "projects/$pid" --method GET 2>/dev/null | jq -r '.namespace.full_path // empty' | read -r group_path
+        # Derive group from repository path: "group/subgroup/project" -> "group/subgroup"
+        if [[ -n "$REPO" ]]; then
+            local group_path=$(echo "$REPO" | rev | cut -d'/' -f2- | rev)
             if [[ -n "$group_path" ]]; then
-                glab api --method POST "groups/$group_path/epics/$EPIC_ID/issues/$ISSUE_ID" 2>/dev/null || {
-                    # Fallback: add a note referencing the epic
-                    glab issue note "$ISSUE_ID" --message "Part of epic #$EPIC_ID" 2>/dev/null || true
+                glab api --method POST "groups/$group_path/epics/$EPIC_ID/issues/$ISSUE_ID" 2>/dev/null && {
+                    echo "Linked GitLab issue #$ISSUE_ID to epic #$EPIC_ID"
+                    exit 0
                 }
-            else
-                glab issue note "$ISSUE_ID" --message "Part of epic #$EPIC_ID" 2>/dev/null || true
             fi
-        else
-            glab issue note "$ISSUE_ID" --message "Part of epic #$EPIC_ID" 2>/dev/null || true
         fi
+        # Fallback: add a note referencing the epic
+        glab issue note "$ISSUE_ID" ${REPO:+--repo "$REPO"} --message "Part of epic #$EPIC_ID" 2>/dev/null || true
         echo "Linked GitLab issue #$ISSUE_ID to epic #$EPIC_ID"
         ;;
     *)

package/templates/pi/scripts/git/update-tracking-issue.sh

@@ -6,6 +6,7 @@
 # Usage: bash .pi/scripts/git/update-tracking-issue.sh \
 #   --id 100 \
 #   --comment "✓ Issue #102 complete (CI green, tests pass)"
+#   [--repo "group/project"]
 
 set -euo pipefail
 
@@ -21,21 +22,34 @@ detect_platform() {
     else echo "none"; fi
 }
 
+read_repository() {
+    if [ -f "guardian-manifest.json" ]; then
+        jq -r '.repository // (.templateContext.repository // "")' guardian-manifest.json 2>/dev/null || echo ""
+    else
+        echo ""
+    fi
+}
+
 ISSUE_ID=""
 COMMENT=""
+REPO=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
         --id) ISSUE_ID="$2"; shift 2 ;;
         --comment) COMMENT="$2"; shift 2 ;;
+        --repo) REPO="$2"; shift 2 ;;
         *) shift ;;
     esac
 done
 
 PLATFORM=$(detect_platform)
+if [[ -z "$REPO" ]]; then
+    REPO=$(read_repository)
+fi
 
 if [[ -z "$ISSUE_ID" || -z "$COMMENT" ]]; then
-    echo "Usage: $0 --id <issue_number> --comment <comment_text>"
+    echo "Usage: $0 --id <issue_number> --comment <comment_text> [--repo <repo>]"
     exit 1
 fi
 
@@ -53,10 +67,10 @@ fi
 
 case "$PLATFORM" in
     github)
-        gh issue comment "$ISSUE_ID" --body "$COMMENT" 2>/dev/null && echo "Comment posted to GitHub issue #$ISSUE_ID"
+        gh issue comment "$ISSUE_ID" ${REPO:+--repo "$REPO"} --body "$COMMENT" 2>/dev/null && echo "Comment posted to GitHub issue #$ISSUE_ID"
         ;;
     gitlab)
-        glab issue note "$ISSUE_ID" --message "$COMMENT" 2>/dev/null && echo "Comment posted to GitLab issue #$ISSUE_ID"
+        glab issue note "$ISSUE_ID" ${REPO:+--repo "$REPO"} --message "$COMMENT" 2>/dev/null && echo "Comment posted to GitLab issue #$ISSUE_ID"
         ;;
     none)
         echo "No git platform detected. Comment not posted."

package/templates/pi/scripts/merge-mr.sh

@@ -36,7 +36,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 PLATFORM=$(detect_platform)
-BRANCH_NAME="feature/${ISSUE_ID}"
+BRANCH_NAME="feat/${ISSUE_ID}"
 
 if [[ "$PLATFORM" == "none" ]]; then
     echo "No git platform detected. Cannot merge without gh/glab CLI."