@ryan_nookpi/pi-extension-setup-sh 0.1.0 → 0.2.0

package/README.md

@@ -1,6 +1,6 @@
 # @ryan_nookpi/pi-extension-setup-sh
 
-Automatically runs the nearest `setup.sh` when a pi session starts.
+Automatically runs `setup.sh` from the current pi working directory when a session starts.
 
 This is useful for repositories that need a predictable bootstrap step before the agent starts editing, testing, or running commands.
 
@@ -12,52 +12,37 @@ pi install npm:@ryan_nookpi/pi-extension-setup-sh
 
 ## What it does
 
-- searches the current directory and parent directories for `setup.sh`
+- looks for `setup.sh` only in the current working directory
 - runs `setup.sh` automatically on session startup
 - skips automatic reruns when the same `setup.sh` already completed successfully
+- keeps a single `/setup-sh` command for manual control
 - shows running, pending, failed, cancelled, and stale states in the pi UI
 - keeps per-project logs and state under pi's setup-sh state directory
 - prevents duplicate setup runs with a lock file
 
-## Commands
+## Command
 
 ```text
 /setup-sh
-/setup-sh status
-/setup-sh rerun
-/setup-sh cancel
-/setup-sh clear
-/setup-sh help
 ```
 
-### `/setup-sh`
+`/setup-sh` is a toggle-style command:
 
-Runs the nearest `setup.sh` manually, or attaches to the current run if one is already active.
+- if no setup run exists yet, it starts `./setup.sh`
+- if setup is currently running, it aborts the active run
+- if setup already finished, it reruns `./setup.sh`
 
-### `/setup-sh status`
-
-Shows the current setup state and recent log lines.
-
-### `/setup-sh rerun`
-
-Runs `setup.sh` again even if the previous run succeeded.
-
-### `/setup-sh cancel`
-
-Sends a termination signal to the active setup process.
-
-### `/setup-sh clear`
-
-Hides the setup widget for the current session.
+No subcommands are registered.
 
 ## Behavior
 
-- `setup.sh` is executed with `/bin/zsh` from the directory containing the script.
+- `setup.sh` is executed with `/bin/zsh` from the current working directory.
 - A successful automatic run is remembered by the script hash, so changing `setup.sh` allows it to run again.
 - Long-running setup output becomes `pending` in the UI when logs have been idle for a while.
-- Failed and stale states stay visible so you can inspect them with `/setup-sh status` or rerun with `/setup-sh rerun`.
+- Failed and stale states stay visible and can be rerun with `/setup-sh`.
+- If the current directory does not contain `setup.sh`, `/setup-sh` reports that it was not found in the current folder.
 
 ## Requirements
 
 - pi
-- a readable `setup.sh` file in the project directory or one of its parents
+- a readable `setup.sh` file in the current pi working directory

package/context.ts

@@ -49,13 +49,8 @@ export function findSetupPath(cwd: string): string | null {
 		// Keep resolved cwd when the directory cannot be canonicalized yet.
 	}
 
-	while (true) {
-		const candidate = path.join(current, "setup.sh");
-		if (isExecutableOrReadable(candidate)) return candidate;
-		const parent = path.dirname(current);
-		if (parent === current) return null;
-		current = parent;
-	}
+	const candidate = path.join(current, "setup.sh");
+	return isExecutableOrReadable(candidate) ? candidate : null;
 }
 
 export function resolveSetupContext(cwd: string): SetupContext | null {

package/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { PENDING_AFTER_MS, STATE_ROOT, STATUS_KEY, WIDGET_KEY, WIDGET_REFRESH_MS } from "./constants.js";
 import { displayPath, findSetupPath, repoKeyFor, resolveSetupContext } from "./context.js";
 import { cancelSetup, createWrapperScript, startSetup } from "./runner.js";
@@ -10,22 +10,10 @@ import {
 	installWidget,
 	refreshWatcher,
 	renderWidgetLine,
-	showStatus,
 	stopWatcher,
 	type Watcher,
 } from "./widget.js";
 
-function commandHelp(): string {
-	return [
-		"/setup-sh [status|rerun|cancel|clear]",
-		"- 인자 없음: 현재 폴더의 setup.sh 실행 또는 실행 상태 표시",
-		"- status: 상세 상태와 로그 tail 표시",
-		"- rerun: 성공/실패 상태와 무관하게 재실행",
-		"- cancel: 실행 중인 setup.sh 종료",
-		"- clear: 현재 세션의 setup widget 숨김",
-	].join("\n");
-}
-
 async function notifyStartResult(ctx: ExtensionContext, result: StartResult): Promise<void> {
 	if (result.kind === "started") {
 		ctx.ui.notify(`setup.sh 실행 시작: ${displayPath(result.context.repoRoot)}`, "info");
@@ -61,10 +49,9 @@ export const __test__ = {
 
 export default function setupShExtension(pi: ExtensionAPI): void {
 	let watcher: Watcher | null = null;
-	const hiddenRepoKeys = new Set<string>();
 
 	async function watch(ctx: ExtensionContext, context: SetupContext): Promise<void> {
-		if (!ctx.hasUI || hiddenRepoKeys.has(context.repoKey)) return;
+		if (!ctx.hasUI) return;
 		stopWatcher(ctx, watcher);
 		watcher = {
 			context,
@@ -81,10 +68,7 @@ export default function setupShExtension(pi: ExtensionAPI): void {
 
 	async function runOrAttach(ctx: ExtensionContext, mode: StartMode): Promise<StartResult> {
 		const result = await startSetup(ctx.cwd, mode);
-		if (result.kind !== "no-setup" && result.kind !== "failed") {
-			hiddenRepoKeys.delete(result.context.repoKey);
-			await watch(ctx, result.context);
-		}
+		if (result.kind !== "no-setup" && result.kind !== "failed") await watch(ctx, result.context);
 		return result;
 	}
 
@@ -118,55 +102,28 @@ export default function setupShExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.registerCommand("setup-sh", {
-		description: "Run or inspect ./setup.sh for the current folder",
-		getArgumentCompletions: (prefix: string) => {
-			const values = ["status", "rerun", "cancel", "clear", "help"];
-			return values
-				.filter((value) => value.startsWith(prefix.trim()))
-				.map((value) => ({ value, label: value, description: `/setup-sh ${value}` }));
-		},
+		description: "Run, rerun, or abort ./setup.sh in the current folder",
 		handler: async (args, ctx) => {
-			const action = args.trim() || "run";
-			const context = resolveSetupContext(ctx.cwd);
-			if (action === "help") {
-				ctx.ui.notify(commandHelp(), "info");
-				return;
-			}
-			if (!context) {
-				ctx.ui.notify("현재 폴더 또는 상위 폴더에서 setup.sh를 찾지 못했습니다.", "warning");
+			if (args.trim().length > 0) {
+				ctx.ui.notify("사용법: /setup-sh", "warning");
 				return;
 			}
 
-			if (action === "clear") {
-				hiddenRepoKeys.add(context.repoKey);
-				stopWatcher(ctx, watcher);
-				watcher = null;
-				ctx.ui.notify("setup.sh widget을 숨겼습니다.", "info");
-				return;
-			}
-
-			if (action === "status") {
-				hiddenRepoKeys.delete(context.repoKey);
-				await watch(ctx, context);
-				await showStatus(ctx, context);
+			const context = resolveSetupContext(ctx.cwd);
+			if (!context) {
+				ctx.ui.notify("현재 폴더에서 setup.sh를 찾지 못했습니다.", "warning");
 				return;
 			}
 
-			if (action === "cancel") {
+			const current = await finalizeRunIfNeeded(context);
+			if (current?.status === "running") {
 				const message = await cancelSetup(context);
-				hiddenRepoKeys.delete(context.repoKey);
 				await watch(ctx, context);
 				ctx.ui.notify(message, "warning");
 				return;
 			}
 
-			if (action !== "run" && action !== "rerun") {
-				ctx.ui.notify(commandHelp(), "warning");
-				return;
-			}
-
-			const mode: StartMode = action === "rerun" ? "rerun" : "manual";
-			await notifyStartResult(ctx, await runOrAttach(ctx, mode));
+			await notifyStartResult(ctx, await runOrAttach(ctx, current ? "rerun" : "manual"));
 		},
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryan_nookpi/pi-extension-setup-sh",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Auto-run setup.sh extension for pi.",
   "license": "MIT",
   "repository": {
@@ -33,8 +33,8 @@
     ]
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   },
   "publishConfig": {
     "access": "public"

package/widget.ts

@@ -1,6 +1,6 @@
-import type { ExtensionContext, Theme } from "@mariozechner/pi-coding-agent";
-import type { TUI } from "@mariozechner/pi-tui";
-import { truncateToWidth } from "@mariozechner/pi-tui";
+import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import type { TUI } from "@earendil-works/pi-tui";
+import { truncateToWidth } from "@earendil-works/pi-tui";
 import { PENDING_AFTER_MS, STATUS_KEY, WIDGET_KEY } from "./constants.js";
 import { displayPath } from "./context.js";
 import { finalizeRunIfNeeded } from "./state.js";
@@ -49,11 +49,11 @@ export function formatSnapshotLine(snapshot: Snapshot, theme: Pick<Theme, "fg">)
 
 	if (snapshot.status === "success") return `${theme.fg("success", "✅")} setup.sh done ${duration} · ${repo}`;
 	if (snapshot.status === "failed") {
-		return `${theme.fg("error", "❌")} setup.sh failed${exit} · ${repo}${suffix} · /setup-sh status`;
+		return `${theme.fg("error", "❌")} setup.sh failed${exit} · ${repo}${suffix} · /setup-sh`;
 	}
 	if (snapshot.status === "cancelled") return `${theme.fg("warning", "⚠️")} setup.sh cancelled · ${repo}${suffix}`;
 	if (snapshot.status === "stale") {
-		return `${theme.fg("warning", "⚠️")} setup.sh stale · ${repo}${suffix} · /setup-sh rerun`;
+		return `${theme.fg("warning", "⚠️")} setup.sh stale · ${repo}${suffix} · /setup-sh`;
 	}
 	if (snapshot.status === "pending") {
 		return `${theme.fg("warning", "⏳")} setup.sh pending${owner} ${duration} · ${repo}${suffix}`;