@oh-my-pi/pi-coding-agent 13.17.0 → 13.17.5

package/CHANGELOG.md

@@ -2,6 +2,108 @@
 
 ## [Unreleased]
 
+## [13.17.5] - 2026-04-01
+### Added
+
+- Added support for writing to ZIP archives using fflate library for cross-platform compatibility
+
+### Changed
+
+- Modified archive writing to detect and handle ZIP files separately from Bun archives
+
+### Removed
+
+- Removed GhPrPushTool test case
+
+## [13.17.4] - 2026-04-01
+### Added
+
+- Support for writing to archive entries in `.tar`, `.tar.gz`, `.tgz`, and `.zip` files using `archive.ext:path/inside/archive` syntax
+- Ability to create new archives when writing to archive subpaths that don't yet exist
+
+## [13.17.3] - 2026-04-01
+
+### Added
+
+- Added support for converting Jupyter notebooks (`.ipynb`) to markdown via markit
+- Added `markit-ai` npm package for native document and notebook conversion
+- Added support for reading files from `.tar`, `.tar.gz`, `.tgz`, and `.zip` archives using virtual subpaths like `archive.ext:path/to/file`
+- Added ability to list archive contents and navigate subdirectories within supported archive formats
+- Added archive-aware `read` support for `.tar`, `.tar.gz`, `.tgz`, and `.zip`, including virtual subpaths like `archive.ext:path/to/file`
+- Added `/tools` slash command to show the tools currently visible to the agent in the interactive session
+
+### Changed
+
+- Replaced Python-based markitdown CLI tool with native `markit-ai` library for document conversion
+- Updated document conversion to use markit library instead of external markitdown command
+- Removed markitdown from Python tools manager (no longer needed as external dependency)
+- Updated `read` tool documentation to reflect archive support and usage patterns
+
+## [13.17.2] - 2026-04-01
+### Added
+
+- Added `/marketplace help` command to display usage guide for all marketplace operations
+- Added dedicated `gh-renderer.ts` module for rich terminal rendering of GitHub Actions workflow runs with live status snapshots and job details
+- Added `gh_pr_checkout` tool to check out GitHub pull requests into dedicated git worktrees with contributor push metadata
+- Added `gh_pr_push` tool to push checked-out pull request branches back to their source branches
+- Added `gh_repo_view` tool to read GitHub repository metadata using the local GitHub CLI
+- Added `gh_issue_view` tool to read GitHub issues with optional comment context
+- Added `gh_pr_view` tool to read GitHub pull requests with optional comment context
+- Added `gh_pr_diff` tool to read GitHub pull request diffs with optional file filtering
+- Added `gh_search_issues` tool to search GitHub issues with repository scoping
+- Added `gh_search_prs` tool to search GitHub pull requests with repository scoping
+- Added `gh_run_watch` tool to watch GitHub Actions workflow runs, fast-fail on job failures, and stream tailed logs for failed jobs
+- Added `github.enabled` setting to enable read-only `gh_*` GitHub CLI tools for repository, issue, pull request, diff, and search workflows
+- Added bundled `/green` command to generate iterative CI fix prompts with optional tag instructions when HEAD is tagged
+- Added `github.enabled` setting to enable read-only `gh_*` GitHub CLI tools for repository, issue, pull request, diff, and search workflows
+- Added `gh_repo_view` tool to read GitHub repository metadata using the local GitHub CLI
+- Added `gh_issue_view` tool to read GitHub issues with optional comment context
+- Added `gh_pr_view` tool to read GitHub pull requests with optional comment context
+- Added `gh_pr_diff` tool to read GitHub pull request diffs with optional file filtering
+- Added `gh_search_issues` tool to search GitHub issues with repository scoping
+- Added `gh_search_prs` tool to search GitHub pull requests with repository scoping
+- Added `gh_run_watch` tool to watch GitHub Actions workflow runs, fast-fail on job failures, and stream tailed logs for failed jobs
+- Added bundled `/green` command to generate iterative CI fix prompts with optional tag instructions when HEAD is tagged
+- Project-scoped marketplace plugin installs: `omp plugin install --scope project name@marketplace` and `/marketplace install --scope project name@marketplace` install plugins into the nearest `.omp/` or `.git`-rooted project directory instead of the user directory ([#581](https://github.com/can1357/oh-my-pi/issues/581))
+- `--scope user|project` flag added to `/marketplace uninstall`, `/marketplace upgrade`, `/plugins enable`, and `/plugins disable` to disambiguate when a plugin is installed in both scopes
+- `omp plugin upgrade --scope project` with no plugin ID warns that `--scope` is ignored for bulk upgrades
+- Added opt-in `gh_*` GitHub CLI tools behind the `github.enabled` setting for repository, issue, pull request, diff, and search workflows
+- Added opt-in `gh_run_watch` to fast-fail GitHub Actions runs, stream job status snapshots, and return tailed logs for failed jobs
+- Added bundled `/green` command to generate the iterative “fix CI until green” prompt, with final tag instructions included only when `HEAD` already has a tag
+
+### Changed
+
+- Improved marketplace catalog parsing to skip invalid plugin entries with warnings instead of failing the entire catalog load
+- Enhanced `/marketplace discover` command to suggest adding the official marketplace when no plugins are available
+- Improved `/marketplace` command messaging with clearer guidance for first-time setup and available commands
+- Enhanced `gh_run_watch` tool call rendering to display animated spinner status and target description (run ID, branch, or current HEAD) with improved visual hierarchy
+- Enhanced `gh_pr_view` tool to include inline review comments alongside pull request reviews for improved discussion context
+- Improved `gh_run_watch` tool output rendering with dedicated visual component for streaming run snapshots and job status updates
+
+### Fixed
+
+- Fixed marketplace error messages to display error details instead of object stringification
+- Fixed artifact storage for non-persistent sessions to use in-memory fallback instead of returning undefined, enabling proper spill truncation for all session types
+- Fixed prompt file formatting to include trailing newlines at EOF for consistency across all prompt markdown files
+- Fixed `gh_pr_diff` to preserve raw patch content instead of normalizing tabs and whitespace
+- Fixed `gh_pr_view` to include inline review comments alongside pull request reviews and issue-style comments for discussion context
+- Fixed `gh_run_watch` to resolve explicit branch watches against the selected branch head instead of local `HEAD`
+- Fixed `gh_run_watch` to hide repo and polling internals from the tool schema and save full failed-job logs as session artifacts alongside the inline tailed output
+- Fixed `gh_*` tool outputs to spill full large results to artifacts instead of pre-truncating the head with unusable `offset=` guidance
+- Fixed bundled `/green` to watch the workflow runs for the current `HEAD` commit instead of whichever branch run was newest
+- Fixed OpenAI Responses session rehydration to strip stale assistant replay payloads before resumed requests ([#594](https://github.com/can1357/oh-my-pi/pull/594) by [@daandden](https://github.com/daandden))
+- Fixed inline image rendering to cap image height and preserve multiplexer scrollback during terminal resizes ([#587](https://github.com/can1357/oh-my-pi/pull/587) by [@smileynet](https://github.com/smileynet))
+
+## [13.17.1] - 2026-04-01
+### Removed
+
+- Removed `code_search` tool for code snippet and documentation search
+
+### Fixed
+
+- Fixed edit tool diff rendering to wrap long diff lines with continuation gutters instead of truncating them at terminal width ([#578](https://github.com/can1357/oh-my-pi/issues/578))
+- Fixed `--list-models` and `/model` provider filtering to hide models from disabled providers ([#588](https://github.com/can1357/oh-my-pi/issues/588))
+- Fixed edit tool diffstats to use diff-specific add/remove theme colors instead of success/error status colors ([#589](https://github.com/can1357/oh-my-pi/issues/589))
 ## [13.17.0] - 2026-03-30
 
 ### Added

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.17.0",
+	"version": "13.17.5",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -35,26 +35,28 @@
 		"format-prompts": "bun scripts/format-prompts.ts",
 		"generate-docs-index": "bun scripts/generate-docs-index.ts",
 		"prepack": "bun scripts/generate-docs-index.ts",
-		"build:binary": "cd ../.. && bun --cwd=packages/stats scripts/generate-client-bundle.ts && bun --cwd=packages/natives run embed:native && bun build --compile --define PI_COMPILED=true --root . ./packages/coding-agent/src/cli.ts --outfile packages/coding-agent/dist/omp && bun --cwd=packages/natives run embed:native --reset && bun --cwd=packages/stats scripts/generate-client-bundle.ts --reset",
+		"build:binary": "cd ../.. && bun --cwd=packages/stats scripts/generate-client-bundle.ts && bun --cwd=packages/natives run embed:native && bun build --compile --define PI_COMPILED=true --external mupdf --root . ./packages/coding-agent/src/cli.ts --outfile packages/coding-agent/dist/omp && bun --cwd=packages/natives run embed:native --reset && bun --cwd=packages/stats scripts/generate-client-bundle.ts --reset",
 		"generate-template": "bun scripts/generate-template.ts",
 		"test": "bun test"
 	},
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.17.0",
-		"@oh-my-pi/pi-agent-core": "13.17.0",
-		"@oh-my-pi/pi-ai": "13.17.0",
-		"@oh-my-pi/pi-natives": "13.17.0",
-		"@oh-my-pi/pi-tui": "13.17.0",
-		"@oh-my-pi/pi-utils": "13.17.0",
+		"@oh-my-pi/omp-stats": "13.17.5",
+		"@oh-my-pi/pi-agent-core": "13.17.5",
+		"@oh-my-pi/pi-ai": "13.17.5",
+		"@oh-my-pi/pi-natives": "13.17.5",
+		"@oh-my-pi/pi-tui": "13.17.5",
+		"@oh-my-pi/pi-utils": "13.17.5",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",
 		"chalk": "^5.6",
 		"diff": "^8.0",
+		"fflate": "0.8.2",
 		"handlebars": "^4.7",
 		"linkedom": "^0.18",
+		"markit-ai": "0.5.0",
 		"puppeteer": "^24.37",
 		"zod": "4.3.6"
 	},

package/scripts/format-prompts.ts

@@ -10,7 +10,7 @@
  * 5. Compact markdown tables (remove padding)
  * 6. Collapse 2+ blank lines to single blank line
  * 7. Trim trailing whitespace (preserve indentation)
- * 8. No trailing newline at EOF
+ * 8. Trailing newline at EOF (disk only; runtime omits it)
  * 9. Bold RFC 2119 keywords (MUST, SHOULD, MAY, etc.) in prompt content
  */
 import { Glob } from "bun";
@@ -44,11 +44,11 @@ async function main() {
 		const original = await Bun.file(fullPath).text();
 		const formatted = formatPromptContent(original, PROMPT_FORMAT_OPTIONS);
 
-		if (original !== formatted) {
+		if (original !== `${formatted}\n`) {
 			if (check) {
 				console.log(`Would format: ${fullPath}`);
 			} else {
-				await Bun.write(fullPath, formatted);
+				await Bun.write(fullPath, `${formatted}\n`);
 				console.log(`Formatted: ${fullPath}`);
 			}
 			changed++;

package/src/cli/plugin-cli.ts

@@ -4,8 +4,9 @@
  * Handles `omp plugin <command>` subcommands for plugin lifecycle management.
  */
 
-import { APP_NAME } from "@oh-my-pi/pi-utils";
+import { APP_NAME, getProjectDir } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { resolveOrDefaultProjectRegistryPath } from "../discovery/helpers";
 import { PluginManager, parseSettingValue, validateSetting } from "../extensibility/plugins";
 import {
 	getInstalledPluginsRegistryPath,
@@ -46,6 +47,7 @@ export interface PluginCommandArgs {
 		enable?: string;
 		disable?: string;
 		set?: string;
+		scope?: "user" | "project";
 	};
 }
 
@@ -113,6 +115,18 @@ export function parsePluginArgs(args: string[]): PluginCommandArgs | undefined {
 			result.flags.disable = args[++i];
 		} else if (arg === "--set" && i + 1 < args.length) {
 			result.flags.set = args[++i];
+		} else if (arg === "--scope" && i + 1 < args.length && !args[i + 1].startsWith("-")) {
+			const s = args[++i];
+			if (s === "user" || s === "project") {
+				result.flags.scope = s;
+			} else {
+				console.error(chalk.red(`Invalid --scope value: "${s}". Must be "user" or "project".`));
+				process.exit(1);
+			}
+		} else if (arg === "--scope") {
+			// --scope with no value following
+			console.error(chalk.red(`--scope requires a value: "user" or "project".`));
+			process.exit(1);
 		} else if (!arg.startsWith("-")) {
 			result.args.push(arg);
 		}
@@ -179,10 +193,11 @@ export async function runPluginCommand(cmd: PluginCommandArgs): Promise<void> {
 // Marketplace Handlers
 // =============================================================================
 
-function makeMarketplaceManager(): MarketplaceManager {
+async function makeMarketplaceManager(): Promise<MarketplaceManager> {
 	return new MarketplaceManager({
 		marketplacesRegistryPath: getMarketplacesRegistryPath(),
 		installedRegistryPath: getInstalledPluginsRegistryPath(),
+		projectInstalledRegistryPath: await resolveOrDefaultProjectRegistryPath(getProjectDir()),
 		marketplacesCacheDir: getMarketplacesCacheDir(),
 		pluginsCacheDir: getPluginsCacheDir(),
 	});
@@ -190,7 +205,7 @@ function makeMarketplaceManager(): MarketplaceManager {
 
 async function handleMarketplace(args: string[], _flags: PluginCommandArgs["flags"]): Promise<void> {
 	const subcommand = args[0] ?? "list";
-	const manager = makeMarketplaceManager();
+	const manager = await makeMarketplaceManager();
 
 	switch (subcommand) {
 		case "add": {
@@ -268,7 +283,7 @@ async function handleMarketplace(args: string[], _flags: PluginCommandArgs["flag
 
 async function handleDiscover(args: string[], _flags: PluginCommandArgs["flags"]): Promise<void> {
 	const marketplace = args[0];
-	const manager = makeMarketplaceManager();
+	const manager = await makeMarketplaceManager();
 	try {
 		const plugins = await manager.listAvailablePlugins(marketplace);
 
@@ -290,20 +305,34 @@ async function handleDiscover(args: string[], _flags: PluginCommandArgs["flags"]
 	}
 }
 
-async function handleUpgrade(args: string[], _flags: PluginCommandArgs["flags"]): Promise<void> {
-	const manager = makeMarketplaceManager();
+async function handleUpgrade(args: string[], flags: PluginCommandArgs["flags"]): Promise<void> {
+	const manager = await makeMarketplaceManager();
 	const pluginId = args[0];
 	try {
 		if (pluginId) {
-			const result = await manager.upgradePlugin(pluginId);
-			console.log(chalk.green(`Upgraded ${pluginId} to ${result.version}`));
+			if (flags.scope) {
+				const result = await manager.upgradePlugin(pluginId, flags.scope);
+				console.log(chalk.green(`Upgraded ${pluginId} (${flags.scope}) to ${result.version}`));
+			} else {
+				const entries = await manager.upgradePluginAcrossScopes(pluginId);
+				for (const entry of entries) {
+					console.log(chalk.green(`Upgraded ${pluginId} (${entry.scope}) to ${entry.version}`));
+				}
+			}
 		} else {
+			if (flags.scope) {
+				console.error(
+					chalk.yellow(
+						`Warning: --scope is ignored when upgrading all plugins. Use 'omp plugin upgrade <id> --scope ${flags.scope}' to target a specific plugin and scope.`,
+					),
+				);
+			}
 			const results = await manager.upgradeAllPlugins();
 			if (results.length === 0) {
 				console.log("All marketplace plugins are up to date.");
 			} else {
 				for (const r of results) {
-					console.log(chalk.green(`  ${r.pluginId}: ${r.from} -> ${r.to}`));
+					console.log(chalk.green(`  ${r.pluginId} (${r.scope}): ${r.from} -> ${r.to}`));
 				}
 			}
 		}
@@ -316,7 +345,7 @@ async function handleUpgrade(args: string[], _flags: PluginCommandArgs["flags"])
 async function handleInstall(
 	manager: PluginManager,
 	packages: string[],
-	flags: { json?: boolean; force?: boolean; dryRun?: boolean },
+	flags: { json?: boolean; force?: boolean; dryRun?: boolean; scope?: "user" | "project" },
 ): Promise<void> {
 	if (packages.length === 0) {
 		console.error(chalk.red(`Usage: ${APP_NAME} plugin install <package[@version]>[features] ...`));
@@ -327,7 +356,7 @@ async function handleInstall(
 	}
 
 	// Build known marketplace set for classification
-	const mktMgr = makeMarketplaceManager();
+	const mktMgr = await makeMarketplaceManager();
 	const knownMarketplaces = new Set((await mktMgr.listMarketplaces()).map(m => m.name));
 
 	for (const spec of packages) {
@@ -337,6 +366,7 @@ async function handleInstall(
 			try {
 				const entry = await mktMgr.installPlugin(target.name, target.marketplace, {
 					force: flags.force,
+					scope: flags.scope,
 				});
 				console.log(
 					chalk.green(
@@ -350,6 +380,15 @@ async function handleInstall(
 			continue;
 		}
 
+		// --scope only applies to marketplace installs; warn when it would be silently no-op'd for npm.
+		if (flags.scope) {
+			console.error(
+				chalk.yellow(
+					`Warning: --scope is only supported for marketplace installs (name@marketplace). Ignoring for ${spec}.`,
+				),
+			);
+		}
+
 		// npm path
 		try {
 			const result = await manager.install(spec, { force: flags.force, dryRun: flags.dryRun });
@@ -376,7 +415,11 @@ async function handleInstall(
 	}
 }
 
-async function handleUninstall(manager: PluginManager, packages: string[], flags: { json?: boolean }): Promise<void> {
+async function handleUninstall(
+	manager: PluginManager,
+	packages: string[],
+	flags: { json?: boolean; scope?: "user" | "project" },
+): Promise<void> {
 	if (packages.length === 0) {
 		console.error(chalk.red(`Usage: ${APP_NAME} plugin uninstall <package> ...`));
 		process.exit(1);
@@ -384,14 +427,14 @@ async function handleUninstall(manager: PluginManager, packages: string[], flags
 
 	// For uninstall, check the installed plugins registry directly.
 	// This works even if the marketplace entry was later removed from marketplaces.json.
-	const mktMgr = makeMarketplaceManager();
+	const mktMgr = await makeMarketplaceManager();
 	const installedPlugins = new Set((await mktMgr.listInstalledPlugins()).map(p => p.id));
 
 	for (const name of packages) {
 		if (installedPlugins.has(name)) {
 			// Exact match against installed marketplace plugin IDs (name@marketplace)
 			try {
-				await mktMgr.uninstallPlugin(name);
+				await mktMgr.uninstallPlugin(name, flags.scope);
 				console.log(chalk.green(`${theme.status.success} Uninstalled ${name}`));
 			} catch (err) {
 				console.error(chalk.red(`${theme.status.error} Failed to uninstall ${name}: ${err}`));
@@ -417,7 +460,7 @@ async function handleUninstall(manager: PluginManager, packages: string[], flags
 
 async function handleList(manager: PluginManager, flags: { json?: boolean }): Promise<void> {
 	const npmPlugins = await manager.list();
-	const mktMgr = makeMarketplaceManager();
+	const mktMgr = await makeMarketplaceManager();
 	const mktPlugins = await mktMgr.listInstalledPlugins();
 
 	if (flags.json) {
@@ -462,7 +505,9 @@ async function handleList(manager: PluginManager, flags: { json?: boolean }): Pr
 		for (const plugin of mktPlugins) {
 			const entry = plugin.entries[0];
 			const version = entry?.version ?? "unknown";
-			console.log(`  ${plugin.id} (${version})`);
+			const shadowLabel = plugin.shadowedBy ? chalk.dim(" [shadowed]") : "";
+			const scopeLabel = chalk.dim(` (${plugin.scope})`);
+			console.log(`  ${plugin.id} (${version})${scopeLabel}${shadowLabel}`);
 		}
 	}
 }
@@ -781,16 +826,37 @@ async function handleConfigValidate(manager: PluginManager, flags: { json?: bool
 	}
 }
 
-async function handleEnable(manager: PluginManager, plugins: string[], flags: { json?: boolean }): Promise<void> {
+async function handleEnable(
+	manager: PluginManager,
+	plugins: string[],
+	flags: { json?: boolean; scope?: "user" | "project" },
+): Promise<void> {
 	if (plugins.length === 0) {
 		console.error(chalk.red(`Usage: ${APP_NAME} plugin enable <plugin> ...`));
 		process.exit(1);
 	}
 
+	const mktMgr = await makeMarketplaceManager();
+	const installedPlugins = new Set((await mktMgr.listInstalledPlugins()).map(p => p.id));
+
 	for (const name of plugins) {
+		if (installedPlugins.has(name)) {
+			try {
+				await mktMgr.setPluginEnabled(name, true, flags.scope);
+				if (flags.json) {
+					console.log(JSON.stringify({ enabled: name }));
+				} else {
+					console.log(chalk.green(`${theme.status.success} Enabled ${name}`));
+				}
+			} catch (err) {
+				console.error(chalk.red(`${theme.status.error} Failed to enable ${name}: ${err}`));
+				process.exit(1);
+			}
+			continue;
+		}
+
 		try {
 			await manager.setEnabled(name, true);
-
 			if (flags.json) {
 				console.log(JSON.stringify({ enabled: name }));
 			} else {
@@ -803,16 +869,37 @@ async function handleEnable(manager: PluginManager, plugins: string[], flags: {
 	}
 }
 
-async function handleDisable(manager: PluginManager, plugins: string[], flags: { json?: boolean }): Promise<void> {
+async function handleDisable(
+	manager: PluginManager,
+	plugins: string[],
+	flags: { json?: boolean; scope?: "user" | "project" },
+): Promise<void> {
 	if (plugins.length === 0) {
 		console.error(chalk.red(`Usage: ${APP_NAME} plugin disable <plugin> ...`));
 		process.exit(1);
 	}
 
+	const mktMgr = await makeMarketplaceManager();
+	const installedPlugins = new Set((await mktMgr.listInstalledPlugins()).map(p => p.id));
+
 	for (const name of plugins) {
+		if (installedPlugins.has(name)) {
+			try {
+				await mktMgr.setPluginEnabled(name, false, flags.scope);
+				if (flags.json) {
+					console.log(JSON.stringify({ disabled: name }));
+				} else {
+					console.log(chalk.green(`${theme.status.success} Disabled ${name}`));
+				}
+			} catch (err) {
+				console.error(chalk.red(`${theme.status.error} Failed to disable ${name}: ${err}`));
+				process.exit(1);
+			}
+			continue;
+		}
+
 		try {
 			await manager.setEnabled(name, false);
-
 			if (flags.json) {
 				console.log(JSON.stringify({ disabled: name }));
 			} else {
@@ -859,11 +946,12 @@ ${chalk.bold("Config Subcommands:")}
   config validate                Validate all plugin settings
 
 ${chalk.bold("Options:")}
-  --json       Output as JSON
-  --fix        Attempt automatic fixes (doctor)
-  --force      Overwrite without prompting (install)
-  --dry-run    Preview changes without applying (install)
-  -l, --local  Use project-local overrides
+  --json           Output as JSON
+  --fix            Attempt automatic fixes (doctor)
+  --force          Overwrite without prompting (install)
+  --scope <scope>  Install scope: user (default) or project (install name@marketplace)
+  --dry-run        Preview changes without applying (install)
+  -l, --local      Use project-local overrides
 
 ${chalk.bold("Examples:")}
   ${APP_NAME} plugin install @oh-my-pi/exa[search]
@@ -871,5 +959,6 @@ ${chalk.bold("Examples:")}
   ${APP_NAME} plugin features my-plugin --enable search,web
   ${APP_NAME} plugin config set my-plugin apiKey sk-xxx
   ${APP_NAME} plugin doctor --fix
+  ${APP_NAME} plugin install --scope project name@marketplace
 `);
 }

package/src/commands/plugin.ts

@@ -45,6 +45,10 @@ export default class Plugin extends Command {
 		enable: Flags.string({ description: "Enable a feature" }),
 		disable: Flags.string({ description: "Disable a feature" }),
 		set: Flags.string({ description: "Set plugin config (key=value)" }),
+		scope: Flags.string({
+			description: 'Install scope: "user" (default) or "project"',
+			options: ["user", "project"],
+		}),
 	};
 
 	async run(): Promise<void> {
@@ -64,6 +68,7 @@ export default class Plugin extends Command {
 				enable: flags.enable,
 				disable: flags.disable,
 				set: flags.set,
+				scope: flags.scope as "user" | "project" | undefined,
 			},
 		};
 

package/src/commit/agentic/prompts/analyze-file.md

@@ -19,4 +19,4 @@ Return concise JSON object with:
 Consider how file's changes relate to above files.
 {{/if}}
 
-Call submit_result tool with JSON payload.
+Call submit_result tool with JSON payload.

package/src/commit/agentic/prompts/session-user.md

@@ -22,4 +22,4 @@ May include entries from list in propose_changelog `deletions` field for removal
 {{/each}}
 {{/if}}
 
-Use git_* tools to inspect changes. Call analyze_files for deeper per-file summaries. Finish with propose_commit or split_commit.
+Use git_* tools to inspect changes. Call analyze_files for deeper per-file summaries. Finish with propose_commit or split_commit.

package/src/commit/agentic/prompts/split-confirm.md

@@ -1 +1 @@
-Split commit plan has {{count}} commits. Proceed? (y/N):
+Split commit plan has {{count}} commits. Proceed? (y/N):

package/src/commit/agentic/prompts/system.md

@@ -35,4 +35,4 @@ Tool guidance:
 ## Changelog Requirements
 
 If changelog targets provided, you **MUST** call `propose_changelog` before finishing.
-If you propose split commit plan, include changelog target files in relevant commit changes.
+If you propose split commit plan, include changelog target files in relevant commit changes.

package/src/commit/git/index.ts

@@ -189,12 +189,11 @@ function extractFileHeader(diff: string): string {
 	return headerLines.join("\n");
 }
 
-function joinPatch(parts: string[]): string {
-	return parts
+export function joinPatch(parts: string[]): string {
+	return `${parts
 		.map(part => (part.endsWith("\n") ? part : `${part}\n`))
 		.join("\n")
-		.trimEnd()
-		.concat("\n");
+		.replace(/\n+$/, "")}\n`;
 }
 
 function selectHunks(file: FileHunks, selector: HunkSelection["hunks"]): FileHunks["hunks"] {

package/src/commit/model-selection.ts

@@ -1,7 +1,7 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { MODEL_ROLE_IDS } from "../config/model-registry";
-import { parseModelPattern, resolveModelRoleValue } from "../config/model-resolver";
+import { parseModelPattern, resolveModelRoleValue, resolveRoleSelection } from "../config/model-resolver";
 import type { Settings } from "../config/settings";
 import MODEL_PRIO from "../priority.json" with { type: "json" };
 
@@ -11,24 +11,6 @@ export interface ResolvedCommitModel {
 	thinkingLevel?: ThinkingLevel;
 }
 
-function resolveRoleSelection(
-	roles: readonly string[],
-	settings: Settings,
-	availableModels: Model<Api>[],
-): { model: Model<Api>; thinkingLevel?: ThinkingLevel } | undefined {
-	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
-	for (const role of roles) {
-		const resolved = resolveModelRoleValue(settings.getModelRole(role), availableModels, {
-			settings,
-			matchPreferences,
-		});
-		if (resolved.model) {
-			return { model: resolved.model, thinkingLevel: resolved.thinkingLevel };
-		}
-	}
-	return undefined;
-}
-
 export async function resolvePrimaryModel(
 	override: string | undefined,
 	settings: Settings,

package/src/commit/prompts/analysis-system.md

@@ -145,4 +145,4 @@ Call create_conventional_analysis with:
   "details": [],
   "issue_refs": []
 }
-</example>
+</example>

package/src/commit/prompts/analysis-user.md

@@ -35,4 +35,4 @@
 {{/if}}
 <diff>
 {{ diff }}
-</diff>
+</diff>

package/src/commit/prompts/changelog-system.md

@@ -47,4 +47,4 @@ Return ONLY valid JSON; no markdown fences or explanation.
 
 With entries: {"entries": {"Added": ["entry 1"], "Fixed": ["entry 2"]}}
 No changelog-worthy changes: {"entries": {}}
-</output-format>
+</output-format>

package/src/commit/prompts/changelog-user.md

@@ -15,4 +15,4 @@ Already documented—skip these:
 
 <diff>
 {{ diff }}
-</diff>
+</diff>

package/src/commit/prompts/file-observer-system.md

@@ -21,4 +21,4 @@ Plain list, no preamble, no summary, no markdown formatting.
 - changed 'Connection::new()' to accept '&Config' instead of individual params
 </output-format>
 
-Observations only. Classification in reduce phase.
+Observations only. Classification in reduce phase.

package/src/commit/prompts/file-observer-user.md

@@ -5,4 +5,4 @@
 <related-files>
 {{ context_header }}
 </related-files>
-{{/if}}
+{{/if}}

package/src/commit/prompts/reduce-system.md

@@ -47,4 +47,4 @@ Output:
 ],
 "issue_refs": []
 }
-</example>
+</example>

package/src/commit/prompts/reduce-user.md

@@ -14,4 +14,4 @@
 
 <scope-candidates>
 {{ scope_candidates }}
-</scope-candidates>
+</scope-candidates>

package/src/commit/prompts/summary-retry.md

@@ -1,3 +1,3 @@
 {{#if base_context}}
 {{ base_context }}
-{{/if}}Previous summary failed validation: {{ errors }}
+{{/if}}Previous summary failed validation: {{ errors }}

package/src/commit/prompts/summary-system.md

@@ -35,4 +35,4 @@ build | Updated serde to fix CVE-2024-1234
 </examples>
 <banned-words>
 comprehensive, various, several, improved, enhanced, quickly, simply, basically, this change, this commit, now
-</banned-words>
+</banned-words>

package/src/commit/prompts/summary-user.md

@@ -10,4 +10,4 @@
 
 <diff-stat>
 {{ stat }}
-</diff-stat>
+</diff-stat>

package/src/commit/prompts/types-description.md

@@ -1,2 +1,2 @@
 Types: feat, fix, refactor, perf, docs, test, build, ci, chore, style, revert.
-Format: <type>(<scope>): <summary> with past-tense summary.
+Format: <type>(<scope>): <summary> with past-tense summary.