@google/jules-merge 0.0.1

package/dist/merge/src/init/init-handler.d.ts

@@ -0,0 +1,4 @@
+import type { InitSpec, InitInput, InitResult } from './init-spec.js';
+export declare class InitHandler implements InitSpec {
+    execute(input: InitInput): Promise<InitResult>;
+}

package/dist/merge/src/init/init-spec.d.ts

@@ -0,0 +1,41 @@
+import { z } from 'zod';
+export declare const InitInputSchema: z.ZodObject<{
+    outputDir: z.ZodDefault<z.ZodString>;
+    workflowName: z.ZodDefault<z.ZodString>;
+    baseBranch: z.ZodDefault<z.ZodString>;
+    force: z.ZodDefault<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    force: boolean;
+    outputDir: string;
+    workflowName: string;
+    baseBranch: string;
+}, {
+    force?: boolean | undefined;
+    outputDir?: string | undefined;
+    workflowName?: string | undefined;
+    baseBranch?: string | undefined;
+}>;
+export type InitInput = z.infer<typeof InitInputSchema>;
+export declare const InitErrorCode: z.ZodEnum<["DIRECTORY_NOT_FOUND", "FILE_ALREADY_EXISTS", "WRITE_FAILED", "UNKNOWN_ERROR"]>;
+export type InitErrorCode = z.infer<typeof InitErrorCode>;
+export interface InitData {
+    filePath: string;
+    content: string;
+}
+export interface InitSuccess {
+    success: true;
+    data: InitData;
+}
+export interface InitFailure {
+    success: false;
+    error: {
+        code: InitErrorCode;
+        message: string;
+        recoverable: boolean;
+        suggestion?: string;
+    };
+}
+export type InitResult = InitSuccess | InitFailure;
+export interface InitSpec {
+    execute(input: InitInput): Promise<InitResult>;
+}

package/dist/merge/src/init/templates.d.ts

@@ -0,0 +1,10 @@
+export interface WorkflowTemplateOptions {
+    workflowName: string;
+    baseBranch: string;
+}
+/**
+ * Build the GitHub Actions workflow YAML for merge conflict detection.
+ * Isolated from handler logic so template changes never conflict with
+ * file-writing logic changes.
+ */
+export declare function buildWorkflowYaml(options: WorkflowTemplateOptions): string;

package/dist/merge/src/mcp/index.d.ts

@@ -0,0 +1 @@
+export { createMergeServer } from './server.js';

package/dist/merge/src/mcp/server.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export declare function createMergeServer(): McpServer;

package/dist/merge/src/shared/git.d.ts

@@ -0,0 +1,17 @@
+export type GitResult<T> = {
+    ok: true;
+    data: T;
+} | {
+    ok: false;
+    error: string;
+};
+/**
+ * List files with unmerged status (UU) from git status.
+ * Used only by the CI failure handler.
+ */
+export declare function gitStatusUnmerged(cwd?: string): Promise<GitResult<string[]>>;
+/**
+ * Find the merge base between two commits.
+ * Used only by the CI failure handler.
+ */
+export declare function gitMergeBase(head: string, base: string, cwd?: string): Promise<GitResult<string>>;

package/dist/merge/src/shared/github.d.ts

@@ -0,0 +1,18 @@
+import { Octokit } from '@octokit/rest';
+/**
+ * Create an authenticated Octokit instance.
+ *
+ * Auth priority (matches @google/jules-fleet):
+ * 1. GitHub App (GITHUB_APP_ID + GITHUB_APP_PRIVATE_KEY[_BASE64] + GITHUB_APP_INSTALLATION_ID)
+ * 2. PAT fallback (GITHUB_TOKEN or GH_TOKEN)
+ */
+export declare function createOctokit(): Octokit;
+/**
+ * Compare two commits and return the list of changed file paths.
+ */
+export declare function compareCommits(octokit: Octokit, owner: string, repo: string, base: string, head: string): Promise<string[]>;
+/**
+ * Get the content of a file from a specific ref.
+ * Returns empty string if file is not found (404).
+ */
+export declare function getFileContent(octokit: Octokit, owner: string, repo: string, path: string, ref: string): Promise<string>;

package/dist/merge/src/shared/result.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Result helper for success responses.
+ */
+export declare function ok<T>(data: T): {
+    success: true;
+    data: T;
+};
+/**
+ * Result helper for failure responses.
+ */
+export declare function fail<TCode extends string>(code: TCode, message: string, recoverable?: boolean, suggestion?: string): {
+    success: false;
+    error: {
+        code: TCode;
+        message: string;
+        recoverable: boolean;
+        suggestion?: string;
+    };
+};

package/dist/merge/src/shared/session.d.ts

@@ -0,0 +1,16 @@
+import type { JulesClient } from '@google/jules-sdk';
+export { jules as createJulesClient } from '@google/jules-sdk';
+export interface SessionFileInfo {
+    path: string;
+    changeType: 'created' | 'modified' | 'deleted';
+}
+/**
+ * Get the list of files changed in a Jules session.
+ *
+ * Dual-mode:
+ * - If session is busy (in-progress): aggregates changeSet artifacts from activities
+ * - If session is stable (completed): uses the session outcome's changeSet
+ *
+ * Modeled after packages/mcp/src/functions/code-review.ts#aggregateFromActivities
+ */
+export declare function getSessionChangedFiles(client: JulesClient, sessionId: string): Promise<SessionFileInfo[]>;

package/package.json

@@ -0,0 +1,60 @@
+{
+  "name": "@google/jules-merge",
+  "version": "0.0.1",
+  "type": "module",
+  "description": "Predictive conflict detection for parallel AI agents",
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "jules-merge": "./dist/cli/index.mjs"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist/",
+    "README.md"
+  ],
+  "scripts": {
+    "build:js": "bun run build.ts",
+    "build:types": "tsc --emitDeclarationOnly --outDir dist",
+    "build": "bun run build:js && bun run build:types",
+    "test": "vitest",
+    "typecheck": "tsc --noEmit"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/google-labs-code/jules-sdk.git"
+  },
+  "author": "Google LLC",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "registry": "https://wombat-dressing-room.appspot.com",
+    "access": "public"
+  },
+  "dependencies": {
+    "@google/jules-sdk": "^0.1.0",
+    "@octokit/auth-app": "^8.2.0",
+    "@octokit/rest": "^21.0.0",
+    "citty": "^0.1.6",
+    "zod": "^3.25.0"
+  },
+  "peerDependencies": {
+    "@modelcontextprotocol/sdk": "^1.25.1"
+  },
+  "peerDependenciesMeta": {
+    "@modelcontextprotocol/sdk": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@modelcontextprotocol/sdk": "^1.25.1",
+    "@types/bun": "^1.3.9",
+    "@types/node": "^22.15.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.4"
+  }
+}