@ccpocket/bridge 1.30.0 → 1.31.0

package/dist/git-assist.d.ts

@@ -0,0 +1,7 @@
+import type { Provider } from "./parser.js";
+export interface GitAssistOptions {
+    provider: Provider;
+    projectPath: string;
+    model?: string;
+}
+export declare function generateCommitMessage(options: GitAssistOptions): string;

package/dist/git-assist.js

@@ -0,0 +1,51 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
+import { getStagedDiff } from "./git-operations.js";
+const COMMIT_MESSAGE_PROMPT = "Write a single Conventional Commits message in English for the staged changes below. Output only the commit message, with no quotes or explanation.";
+const CODEX_COMMIT_MODEL = "gpt-5.4-mini";
+export function generateCommitMessage(options) {
+    const diff = getStagedDiff(options.projectPath).trim();
+    if (!diff) {
+        throw new Error("Nothing to commit: no files are staged");
+    }
+    const cwd = resolve(options.projectPath);
+    const output = options.provider === "codex"
+        ? runCodexCommitAssist(cwd, diff, options.model)
+        : execFileSync("claude", [
+            "-p",
+            ...(options.model ? ["--model", options.model] : []),
+            COMMIT_MESSAGE_PROMPT,
+        ], {
+            cwd,
+            encoding: "utf-8",
+            input: diff,
+            maxBuffer: 1024 * 1024,
+        });
+    const message = output
+        .split("\n")
+        .map((line) => line.trim())
+        .find(Boolean);
+    if (!message) {
+        throw new Error("Commit message generation returned empty output");
+    }
+    return message;
+}
+function runCodexCommitAssist(cwd, diff, _model) {
+    const outputDir = mkdtempSync(join(tmpdir(), "ccpocket-git-assist-"));
+    const outputPath = join(outputDir, "last-message.txt");
+    try {
+        execFileSync("codex", ["exec", "-m", CODEX_COMMIT_MODEL, "-o", outputPath, "-"], {
+            cwd,
+            encoding: "utf-8",
+            input: `${COMMIT_MESSAGE_PROMPT}\n\n${diff}`,
+            maxBuffer: 1024 * 1024,
+        });
+        return readFileSync(outputPath, "utf-8");
+    }
+    finally {
+        rmSync(outputDir, { recursive: true, force: true });
+    }
+}
+//# sourceMappingURL=git-assist.js.map

package/dist/git-assist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-assist.js","sourceRoot":"","sources":["../src/git-assist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,qBAAqB,GACzB,qJAAqJ,CAAC;AACxJ,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAQ1C,MAAM,UAAU,qBAAqB,CAAC,OAAyB;IAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACzC,MAAM,MAAM,GACV,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC1B,CAAC,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC;QAChD,CAAC,CAAC,YAAY,CACV,QAAQ,EACR;YACE,IAAI;YACJ,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,qBAAqB;SACtB,EACD;YACE,GAAG;YACH,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI,GAAG,IAAI;SACvB,CACF,CAAC;IAER,MAAM,OAAO,GAAG,MAAM;SACnB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,IAAI,CAAC,OAAO,CAAC,CAAC;IACjB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAC3B,GAAW,EACX,IAAY,EACZ,MAAe;IAEf,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAEvD,IAAI,CAAC;QACH,YAAY,CACV,OAAO,EACP,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EACzD;YACE,GAAG;YACH,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,GAAG,qBAAqB,OAAO,IAAI,EAAE;YAC5C,SAAS,EAAE,IAAI,GAAG,IAAI;SACvB,CACF,CAAC;QACF,OAAO,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}

package/dist/git-operations.d.ts

@@ -0,0 +1,63 @@
+export interface HunkRef {
+    file: string;
+    hunkIndex: number;
+}
+export interface CommitResult {
+    hash: string;
+    message: string;
+}
+export interface BranchRemoteStatus {
+    ahead: number;
+    behind: number;
+    hasUpstream: boolean;
+}
+export interface BranchListResult {
+    current: string;
+    branches: string[];
+    /** Branches currently checked out by main repo or worktrees (cannot switch to). */
+    checkedOutBranches: string[];
+    remoteStatusByBranch: Record<string, BranchRemoteStatus>;
+}
+/** Stage entire files. */
+export declare function stageFiles(projectPath: string, files: string[]): void;
+/**
+ * Stage specific hunks by extracting them from `git diff` and applying via `git apply --cached`.
+ *
+ * Groups hunks by file, extracts the diff header + requested hunks, then pipes through `git apply`.
+ */
+export declare function stageHunks(projectPath: string, hunks: HunkRef[]): void;
+/** Unstage files (remove from index, keep working tree changes). */
+export declare function unstageFiles(projectPath: string, files: string[]): void;
+/** Unstage specific hunks from the index, leaving the working tree intact. */
+export declare function unstageHunks(projectPath: string, hunks: HunkRef[]): void;
+/** Create a commit with the given message. Throws if nothing is staged. */
+export declare function gitCommit(projectPath: string, message: string): CommitResult;
+/** Return staged diff content for commit-message generation. */
+export declare function getStagedDiff(projectPath: string): string;
+/** Push to remote. */
+export declare function gitPush(projectPath: string): void;
+/** List branches and branches checked out by worktrees. */
+export declare function listBranches(projectPath: string): BranchListResult;
+/** Create a new branch, optionally checking it out. */
+export declare function createBranch(projectPath: string, name: string, checkout?: boolean): void;
+/** Checkout an existing branch. */
+export declare function checkoutBranch(projectPath: string, branch: string): void;
+/** Revert (discard) unstaged changes for specific files. */
+export declare function revertFiles(projectPath: string, files: string[]): void;
+/** Revert specific working-tree hunks, leaving the index intact. */
+export declare function revertHunks(projectPath: string, hunks: HunkRef[]): void;
+export interface RemoteStatusResult {
+    ahead: number;
+    behind: number;
+    branch: string;
+    hasUpstream: boolean;
+}
+/** Fetch from remote (non-blocking, returns when done). */
+export declare function gitFetch(projectPath: string): void;
+/** Get ahead/behind counts relative to upstream. */
+export declare function gitRemoteStatus(projectPath: string): RemoteStatusResult;
+/** Pull from remote (fetch + merge). */
+export declare function gitPull(projectPath: string): {
+    success: boolean;
+    message: string;
+};

package/dist/git-operations.js

@@ -0,0 +1,251 @@
+import { execFileSync } from "node:child_process";
+import { realpathSync } from "node:fs";
+import { resolve } from "node:path";
+// ---- Helpers ----
+function resolveProject(projectPath) {
+    return realpathSync(resolve(projectPath));
+}
+function git(args, cwd) {
+    return execFileSync("git", args, { cwd, encoding: "utf-8" }).trim();
+}
+function buildHunkPatch(diffText, file, indices) {
+    if (!diffText)
+        return null;
+    const lines = diffText.split("\n");
+    const hunkStarts = [];
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].startsWith("@@")) {
+            hunkStarts.push(i);
+        }
+    }
+    if (hunkStarts.length === 0)
+        return null;
+    const header = lines.slice(0, hunkStarts[0]).join("\n") + "\n";
+    const sortedIndices = [...new Set(indices)].sort((a, b) => a - b);
+    let patch = header;
+    for (const idx of sortedIndices) {
+        if (idx < 0 || idx >= hunkStarts.length) {
+            throw new Error(`Hunk index ${idx} out of range for file ${file} (${hunkStarts.length} hunks)`);
+        }
+        const start = hunkStarts[idx];
+        const end = idx + 1 < hunkStarts.length ? hunkStarts[idx + 1] : lines.length;
+        patch += lines.slice(start, end).join("\n") + "\n";
+    }
+    return patch;
+}
+function applyHunks(projectPath, hunks, options) {
+    const cwd = resolveProject(projectPath);
+    const byFile = new Map();
+    for (const h of hunks) {
+        const list = byFile.get(h.file) ?? [];
+        list.push(h.hunkIndex);
+        byFile.set(h.file, list);
+    }
+    for (const [file, indices] of byFile) {
+        const diffText = git([...options.diffArgs, "--", file], cwd);
+        const patch = buildHunkPatch(diffText, file, indices);
+        if (!patch)
+            continue;
+        execFileSync("git", [...options.applyArgs, "-"], {
+            cwd,
+            encoding: "utf-8",
+            input: patch,
+        });
+    }
+}
+// ---- Phase 1: Staging ----
+/** Stage entire files. */
+export function stageFiles(projectPath, files) {
+    const cwd = resolveProject(projectPath);
+    execFileSync("git", ["add", "--", ...files], { cwd, encoding: "utf-8" });
+}
+/**
+ * Stage specific hunks by extracting them from `git diff` and applying via `git apply --cached`.
+ *
+ * Groups hunks by file, extracts the diff header + requested hunks, then pipes through `git apply`.
+ */
+export function stageHunks(projectPath, hunks) {
+    applyHunks(projectPath, hunks, {
+        diffArgs: ["diff", "--unified=0"],
+        applyArgs: ["apply", "--cached", "--unidiff-zero"],
+    });
+}
+/** Unstage files (remove from index, keep working tree changes). */
+export function unstageFiles(projectPath, files) {
+    const cwd = resolveProject(projectPath);
+    execFileSync("git", ["reset", "HEAD", "--", ...files], {
+        cwd,
+        encoding: "utf-8",
+    });
+}
+/** Unstage specific hunks from the index, leaving the working tree intact. */
+export function unstageHunks(projectPath, hunks) {
+    applyHunks(projectPath, hunks, {
+        diffArgs: ["diff", "--cached", "--unified=0"],
+        applyArgs: ["apply", "-R", "--cached", "--unidiff-zero"],
+    });
+}
+// ---- Phase 2: Commit / Push ----
+/** Create a commit with the given message. Throws if nothing is staged. */
+export function gitCommit(projectPath, message) {
+    const cwd = resolveProject(projectPath);
+    // Check if there's anything staged
+    const staged = git(["diff", "--cached", "--name-only"], cwd);
+    if (!staged) {
+        throw new Error("Nothing to commit: no files are staged");
+    }
+    execFileSync("git", ["commit", "-m", message], { cwd, encoding: "utf-8" });
+    const hash = git(["rev-parse", "--short", "HEAD"], cwd);
+    return { hash, message };
+}
+/** Return staged diff content for commit-message generation. */
+export function getStagedDiff(projectPath) {
+    const cwd = resolveProject(projectPath);
+    return execFileSync("git", ["diff", "--cached", "--no-color"], {
+        cwd,
+        encoding: "utf-8",
+    });
+}
+/** Push to remote. */
+export function gitPush(projectPath) {
+    const cwd = resolveProject(projectPath);
+    const branch = git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+    execFileSync("git", ["push", "--set-upstream", "origin", branch], {
+        cwd,
+        encoding: "utf-8",
+    });
+}
+// ---- Phase 3: Branch Operations ----
+/** List branches and branches checked out by worktrees. */
+export function listBranches(projectPath) {
+    const cwd = resolveProject(projectPath);
+    const current = git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+    const output = git(["branch", "--list", "--format=%(refname:short)"], cwd);
+    const branches = output ? output.split("\n").filter(Boolean) : [];
+    // Collect branches checked out by worktrees (+ main repo)
+    const checkedOutBranches = [];
+    try {
+        const wtOutput = execFileSync("git", ["worktree", "list", "--porcelain"], {
+            cwd,
+            encoding: "utf-8",
+        });
+        for (const line of wtOutput.split("\n")) {
+            if (line.startsWith("branch ")) {
+                const branch = line
+                    .slice("branch ".length)
+                    .replace(/^refs\/heads\//, "");
+                checkedOutBranches.push(branch);
+            }
+        }
+    }
+    catch {
+        /* ignore if worktree command fails */
+    }
+    const remoteStatusByBranch = Object.fromEntries(branches.map((branch) => [branch, getBranchRemoteStatus(cwd, branch)]));
+    return { current, branches, checkedOutBranches, remoteStatusByBranch };
+}
+function getBranchRemoteStatus(cwd, branch) {
+    const upstream = execFileSync("git", ["for-each-ref", "--format=%(upstream:short)", `refs/heads/${branch}`], { cwd, encoding: "utf-8" }).trim();
+    if (!upstream) {
+        return { ahead: 0, behind: 0, hasUpstream: false };
+    }
+    let ahead = 0;
+    let behind = 0;
+    try {
+        ahead =
+            parseInt(git(["rev-list", "--count", `${upstream}..${branch}`], cwd), 10) || 0;
+    }
+    catch {
+        ahead = 0;
+    }
+    try {
+        behind =
+            parseInt(git(["rev-list", "--count", `${branch}..${upstream}`], cwd), 10) || 0;
+    }
+    catch {
+        behind = 0;
+    }
+    return { ahead, behind, hasUpstream: true };
+}
+/** Create a new branch, optionally checking it out. */
+export function createBranch(projectPath, name, checkout) {
+    const cwd = resolveProject(projectPath);
+    if (checkout) {
+        execFileSync("git", ["checkout", "-b", name], { cwd, encoding: "utf-8" });
+    }
+    else {
+        execFileSync("git", ["branch", name], { cwd, encoding: "utf-8" });
+    }
+}
+/** Checkout an existing branch. */
+export function checkoutBranch(projectPath, branch) {
+    const cwd = resolveProject(projectPath);
+    execFileSync("git", ["checkout", branch], { cwd, encoding: "utf-8" });
+}
+/** Revert (discard) unstaged changes for specific files. */
+export function revertFiles(projectPath, files) {
+    const cwd = resolveProject(projectPath);
+    execFileSync("git", ["checkout", "--", ...files], { cwd, encoding: "utf-8" });
+}
+/** Revert specific working-tree hunks, leaving the index intact. */
+export function revertHunks(projectPath, hunks) {
+    applyHunks(projectPath, hunks, {
+        diffArgs: ["diff", "--unified=0"],
+        applyArgs: ["apply", "-R", "--unidiff-zero"],
+    });
+}
+/** Fetch from remote (non-blocking, returns when done). */
+export function gitFetch(projectPath) {
+    const cwd = resolveProject(projectPath);
+    execFileSync("git", ["fetch", "--quiet"], {
+        cwd,
+        encoding: "utf-8",
+        timeout: 30000,
+    });
+}
+/** Get ahead/behind counts relative to upstream. */
+export function gitRemoteStatus(projectPath) {
+    const cwd = resolveProject(projectPath);
+    const branch = git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+    // Check if upstream is configured
+    let hasUpstream = false;
+    try {
+        git(["rev-parse", "--abbrev-ref", `${branch}@{upstream}`], cwd);
+        hasUpstream = true;
+    }
+    catch {
+        return { ahead: 0, behind: 0, branch, hasUpstream: false };
+    }
+    let ahead = 0;
+    let behind = 0;
+    try {
+        const aheadStr = git(["rev-list", "--count", `@{upstream}..HEAD`], cwd);
+        ahead = parseInt(aheadStr, 10) || 0;
+    }
+    catch {
+        /* ignore */
+    }
+    try {
+        const behindStr = git(["rev-list", "--count", `HEAD..@{upstream}`], cwd);
+        behind = parseInt(behindStr, 10) || 0;
+    }
+    catch {
+        /* ignore */
+    }
+    return { ahead, behind, branch, hasUpstream };
+}
+/** Pull from remote (fetch + merge). */
+export function gitPull(projectPath) {
+    const cwd = resolveProject(projectPath);
+    try {
+        const output = execFileSync("git", ["pull"], {
+            cwd,
+            encoding: "utf-8",
+        }).trim();
+        return { success: true, message: output };
+    }
+    catch (err) {
+        return { success: false, message: String(err) };
+    }
+}
+//# sourceMappingURL=git-operations.js.map

package/dist/git-operations.js.map

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

package/dist/parser.d.ts

@@ -162,6 +162,7 @@ export type ClientMessage = {
 } | {
     type: "get_diff";
     projectPath: string;
+    staged?: boolean;
 } | {
     type: "get_diff_image";
     projectPath: string;
@@ -232,6 +233,66 @@ export type ClientMessage = {
 } | {
     type: "refresh_branch";
     sessionId: string;
+} | {
+    type: "git_stage";
+    projectPath: string;
+    files?: string[];
+    hunks?: {
+        file: string;
+        hunkIndex: number;
+    }[];
+} | {
+    type: "git_unstage";
+    projectPath: string;
+    files?: string[];
+} | {
+    type: "git_unstage_hunks";
+    projectPath: string;
+    hunks: {
+        file: string;
+        hunkIndex: number;
+    }[];
+} | {
+    type: "git_commit";
+    projectPath: string;
+    sessionId?: string;
+    message?: string;
+    autoGenerate?: boolean;
+} | {
+    type: "git_push";
+    projectPath: string;
+} | {
+    type: "git_branches";
+    projectPath: string;
+} | {
+    type: "git_create_branch";
+    projectPath: string;
+    name: string;
+    checkout?: boolean;
+} | {
+    type: "git_checkout_branch";
+    projectPath: string;
+    branch: string;
+} | {
+    type: "git_revert_file";
+    projectPath: string;
+    files: string[];
+} | {
+    type: "git_revert_hunks";
+    projectPath: string;
+    hunks: {
+        file: string;
+        hunkIndex: number;
+    }[];
+} | {
+    type: "git_fetch";
+    projectPath: string;
+} | {
+    type: "git_pull";
+    projectPath: string;
+} | {
+    type: "git_remote_status";
+    projectPath: string;
 };
 /** Image change detected in a git diff (binary image file). */
 export interface ImageChange {
@@ -474,6 +535,70 @@ export type ServerMessage = {
     name: string | null;
     success: boolean;
     error?: string;
+} | {
+    type: "git_stage_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_unstage_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_unstage_hunks_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_commit_result";
+    success: boolean;
+    commitHash?: string;
+    message?: string;
+    error?: string;
+} | {
+    type: "git_push_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_branches_result";
+    current: string;
+    branches: string[];
+    checkedOutBranches?: string[];
+    remoteStatusByBranch?: Record<string, {
+        ahead: number;
+        behind: number;
+        hasUpstream: boolean;
+    }>;
+    error?: string;
+} | {
+    type: "git_create_branch_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_checkout_branch_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_revert_file_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_revert_hunks_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_fetch_result";
+    success: boolean;
+    error?: string;
+} | {
+    type: "git_pull_result";
+    success: boolean;
+    message?: string;
+    error?: string;
+} | {
+    type: "git_remote_status_result";
+    ahead: number;
+    behind: number;
+    branch: string;
+    hasUpstream: boolean;
 };
 export interface UsageWindowPayload {
     utilization: number;