@pocketcoder/host 0.0.2

package/dist/handlers/__tests__/git-discard.test.js

@@ -0,0 +1,154 @@
+import { mkdtemp, rm, mkdir, writeFile, readFile, stat } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { ErrorCode } from "@pocketcoder/shared/constants";
+import { openDatabase, closeDatabase } from "../../db/database.js";
+import { createProject } from "../../db/repositories/projects.js";
+import { handleGitDiscard } from "../git-discard.js";
+const execFileAsync = promisify(execFile);
+// Suppress logger output in tests
+vi.mock("../../utils/logger.js", () => ({
+    logger: {
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+    },
+}));
+async function git(cwd, ...args) {
+    const { stdout } = await execFileAsync("git", args, { cwd });
+    return stdout.trim();
+}
+describe("git_discard handler", () => {
+    let tempDir;
+    let projectDir;
+    let dbPath;
+    let projectId;
+    beforeEach(async () => {
+        tempDir = await mkdtemp(join(tmpdir(), "pocketcoder-git-discard-test-"));
+        projectDir = join(tempDir, "project");
+        dbPath = join(tempDir, "daemon.db");
+        await mkdir(projectDir);
+        // Initialize a git repo with initial commit
+        await git(projectDir, "init");
+        await git(projectDir, "config", "user.email", "test@test.com");
+        await git(projectDir, "config", "user.name", "Test User");
+        await writeFile(join(projectDir, "README.md"), "# Test\n");
+        await git(projectDir, "add", ".");
+        await git(projectDir, "commit", "-m", "initial commit");
+        closeDatabase();
+        openDatabase(dbPath);
+        const project = createProject("test-project", projectDir);
+        projectId = project.project_id;
+    });
+    afterEach(async () => {
+        closeDatabase();
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    function createRequest(opts) {
+        return {
+            type: "git_discard",
+            requestId: "req-1",
+            sessionId: projectId,
+            payload: opts,
+        };
+    }
+    function createSendCollector() {
+        const responses = [];
+        const send = (msg) => {
+            responses.push(msg);
+        };
+        return { responses, send };
+    }
+    it("should discard changes to specific files", async () => {
+        // Modify a tracked file
+        await writeFile(join(projectDir, "README.md"), "Modified content\n");
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(createRequest({ paths: ["README.md"] }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.type).toBe("git_discard_response");
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.discarded).toBe(1);
+        // Verify file is restored
+        const content = await readFile(join(projectDir, "README.md"), "utf-8");
+        expect(content).toBe("# Test\n");
+    });
+    it("should discard all tracked changes without all flag", async () => {
+        // Modify tracked files
+        await writeFile(join(projectDir, "README.md"), "Modified\n");
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(createRequest({}), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        // Verify file is restored
+        const content = await readFile(join(projectDir, "README.md"), "utf-8");
+        expect(content).toBe("# Test\n");
+    });
+    it("should discard all changes and delete untracked files with all flag", async () => {
+        // Modify tracked and create untracked
+        await writeFile(join(projectDir, "README.md"), "Modified\n");
+        await writeFile(join(projectDir, "untracked.txt"), "untracked\n");
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(createRequest({ all: true }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.discarded).toBeGreaterThanOrEqual(2);
+        // Verify tracked file is restored
+        const content = await readFile(join(projectDir, "README.md"), "utf-8");
+        expect(content).toBe("# Test\n");
+        // Verify untracked file is deleted
+        await expect(stat(join(projectDir, "untracked.txt"))).rejects.toThrow("ENOENT");
+    });
+    it("should handle clean working directory", async () => {
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(createRequest({}), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.discarded).toBe(0);
+    });
+    it("should error for non-git directory", async () => {
+        const nonGitDir = join(tempDir, "not-a-repo");
+        await mkdir(nonGitDir);
+        closeDatabase();
+        openDatabase(dbPath);
+        const nonGitProject = createProject("non-git-project", nonGitDir);
+        const msg = {
+            type: "git_discard",
+            requestId: "req-2",
+            sessionId: nonGitProject.project_id,
+            payload: {},
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(msg, send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.payload).toBeUndefined();
+        expect(resp.error).toBeDefined();
+        expect(resp.error.code).toBe(ErrorCode.GIT_NOT_INITIALIZED);
+    });
+    it("should return error for non-existent project", async () => {
+        const msg = {
+            type: "git_discard",
+            requestId: "req-3",
+            sessionId: "non-existent-project-id",
+            payload: {},
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitDiscard(msg, send);
+        expect(responses).toHaveLength(1);
+        expect(responses[0].error).toBeDefined();
+        expect(responses[0].error.code).toBe(ErrorCode.INVALID_REQUEST);
+    });
+});
+//# sourceMappingURL=git-discard.test.js.map

package/dist/handlers/__tests__/git-discard.test.js.map

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

package/dist/handlers/__tests__/git-file-base.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=git-file-base.test.d.ts.map

package/dist/handlers/__tests__/git-file-base.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-file-base.test.d.ts","sourceRoot":"","sources":["../../../src/handlers/__tests__/git-file-base.test.ts"],"names":[],"mappings":""}

package/dist/handlers/__tests__/git-file-base.test.js

@@ -0,0 +1,148 @@
+import { mkdtemp, rm, mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { ErrorCode } from "@pocketcoder/shared/constants";
+import { openDatabase, closeDatabase } from "../../db/database.js";
+import { createProject } from "../../db/repositories/projects.js";
+import { handleGitFileBase } from "../git-file-base.js";
+const execFileAsync = promisify(execFile);
+// Suppress logger output in tests
+vi.mock("../../utils/logger.js", () => ({
+    logger: {
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+    },
+}));
+async function git(cwd, ...args) {
+    const { stdout } = await execFileAsync("git", args, { cwd });
+    return stdout.trim();
+}
+describe("git_file_base handler", () => {
+    let tempDir;
+    let projectDir;
+    let dbPath;
+    let projectId;
+    beforeEach(async () => {
+        tempDir = await mkdtemp(join(tmpdir(), "pocketcoder-git-file-base-test-"));
+        projectDir = join(tempDir, "project");
+        dbPath = join(tempDir, "daemon.db");
+        await mkdir(projectDir);
+        await git(projectDir, "init");
+        await git(projectDir, "config", "user.email", "test@test.com");
+        await git(projectDir, "config", "user.name", "Test User");
+        await writeFile(join(projectDir, "README.md"), "# Test Project\n");
+        await mkdir(join(projectDir, "src"), { recursive: true });
+        await writeFile(join(projectDir, "src/app.ts"), "export const app = true;\n");
+        await git(projectDir, "add", ".");
+        await git(projectDir, "commit", "-m", "initial commit");
+        closeDatabase();
+        openDatabase(dbPath);
+        const project = createProject("test-project", projectDir);
+        projectId = project.project_id;
+    });
+    afterEach(async () => {
+        closeDatabase();
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    function createRequest(payload) {
+        return {
+            type: "git_file_base",
+            requestId: "req-1",
+            sessionId: projectId,
+            payload,
+        };
+    }
+    function createSendCollector() {
+        const responses = [];
+        const send = (msg) => {
+            responses.push(msg);
+        };
+        return { responses, send };
+    }
+    it("should return file content at HEAD", async () => {
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(createRequest({ path: "README.md" }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.type).toBe("git_file_base_response");
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.path).toBe("README.md");
+        expect(resp.payload.ref).toBe("HEAD");
+        expect(resp.payload.content).toBe("# Test Project\n");
+    });
+    it("should return null for new file", async () => {
+        // Create a new file that hasn't been committed
+        await writeFile(join(projectDir, "new-file.ts"), "export const x = 1;\n");
+        await git(projectDir, "add", "new-file.ts");
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(createRequest({ path: "new-file.ts" }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.content).toBeNull();
+    });
+    it("should return content at specific ref", async () => {
+        // Get the initial commit sha
+        const sha = await git(projectDir, "rev-parse", "HEAD");
+        // Modify and commit
+        await writeFile(join(projectDir, "README.md"), "# Updated\n");
+        await git(projectDir, "add", ".");
+        await git(projectDir, "commit", "-m", "update readme");
+        // Request the original content at the first commit
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(createRequest({ path: "README.md", ref: sha }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.ref).toBe(sha);
+        expect(resp.payload.content).toBe("# Test Project\n");
+    });
+    it("should error for non-existent project", async () => {
+        const msg = {
+            type: "git_file_base",
+            requestId: "req-2",
+            sessionId: "non-existent-project",
+            payload: { path: "README.md" },
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(msg, send);
+        expect(responses).toHaveLength(1);
+        expect(responses[0].error).toBeDefined();
+        expect(responses[0].error.code).toBe(ErrorCode.INVALID_REQUEST);
+    });
+    it("should error for non-git directory", async () => {
+        const nonGitDir = join(tempDir, "non-git");
+        await mkdir(nonGitDir);
+        const project = createProject("non-git-project", nonGitDir);
+        const msg = {
+            type: "git_file_base",
+            requestId: "req-3",
+            sessionId: project.project_id,
+            payload: { path: "README.md" },
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(msg, send);
+        expect(responses).toHaveLength(1);
+        expect(responses[0].error).toBeDefined();
+        expect(responses[0].error.code).toBe(ErrorCode.GIT_NOT_INITIALIZED);
+    });
+    it("should return file content from subdirectory", async () => {
+        const { responses, send } = createSendCollector();
+        await handleGitFileBase(createRequest({ path: "src/app.ts" }), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.path).toBe("src/app.ts");
+        expect(resp.payload.content).toBe("export const app = true;\n");
+    });
+});
+//# sourceMappingURL=git-file-base.test.js.map

package/dist/handlers/__tests__/git-file-base.test.js.map

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

package/dist/handlers/__tests__/git-pull.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=git-pull.test.d.ts.map

package/dist/handlers/__tests__/git-pull.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-pull.test.d.ts","sourceRoot":"","sources":["../../../src/handlers/__tests__/git-pull.test.ts"],"names":[],"mappings":""}

package/dist/handlers/__tests__/git-pull.test.js

@@ -0,0 +1,180 @@
+import { mkdtemp, rm, mkdir, writeFile, realpath } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { ErrorCode } from "@pocketcoder/shared/constants";
+import { openDatabase, closeDatabase } from "../../db/database.js";
+import { createProject } from "../../db/repositories/projects.js";
+import { handleGitPull } from "../git-pull.js";
+const execFileAsync = promisify(execFile);
+// Suppress logger output in tests
+vi.mock("../../utils/logger.js", () => ({
+    logger: {
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+    },
+}));
+async function git(cwd, ...args) {
+    const { stdout } = await execFileAsync("git", args, { cwd });
+    return stdout.trim();
+}
+describe("git_pull handler", () => {
+    let tempDir;
+    let remoteDir;
+    let projectDir;
+    let otherDir;
+    let dbPath;
+    let projectId;
+    beforeEach(async () => {
+        // Use realpath to get the canonical path (handles macOS /var -> /private/var symlink)
+        const rawTempDir = await mkdtemp(join(tmpdir(), "pocketcoder-git-pull-test-"));
+        tempDir = await realpath(rawTempDir);
+        remoteDir = join(tempDir, "remote.git");
+        projectDir = join(tempDir, "project");
+        otherDir = join(tempDir, "other");
+        dbPath = join(tempDir, "daemon.db");
+        // Create a bare remote repo with master as default branch
+        await mkdir(remoteDir);
+        await git(remoteDir, "init", "--bare", "--initial-branch=master");
+        // Create a local repo that tracks the bare remote
+        await mkdir(projectDir);
+        await git(projectDir, "init");
+        await git(projectDir, "config", "user.email", "test@test.com");
+        await git(projectDir, "config", "user.name", "Test User");
+        await writeFile(join(projectDir, "README.md"), "# Test\n");
+        await git(projectDir, "add", ".");
+        await git(projectDir, "commit", "-m", "initial commit");
+        await git(projectDir, "branch", "-M", "master");
+        await git(projectDir, "config", "pull.rebase", "false");
+        await git(projectDir, "remote", "add", "origin", remoteDir);
+        await git(projectDir, "push", "-u", "origin", "master");
+        // Create another clone to push changes that we'll later pull
+        await mkdir(otherDir);
+        await git(otherDir, "clone", remoteDir, ".");
+        await git(otherDir, "config", "user.email", "other@test.com");
+        await git(otherDir, "config", "user.name", "Other User");
+        closeDatabase();
+        openDatabase(dbPath);
+        const project = createProject("test-project", projectDir);
+        projectId = project.project_id;
+    });
+    afterEach(async () => {
+        closeDatabase();
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    function createPullRequest(payload = {}) {
+        return {
+            type: "git_pull",
+            requestId: "req-1",
+            sessionId: projectId,
+            payload,
+        };
+    }
+    function createSendCollector() {
+        const responses = [];
+        const send = (msg) => {
+            responses.push(msg);
+        };
+        return { responses, send };
+    }
+    it("should pull from remote", async () => {
+        // Push a new commit from the other clone
+        await writeFile(join(otherDir, "new-file.ts"), "export const x = 1;");
+        await git(otherDir, "add", "new-file.ts");
+        await git(otherDir, "commit", "-m", "add new file");
+        await git(otherDir, "push", "origin", "master");
+        const { responses, send } = createSendCollector();
+        await handleGitPull(createPullRequest(), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.type).toBe("git_pull_response");
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.remote).toBe("origin");
+        expect(resp.payload.branch).toBe("master");
+        expect(resp.payload.pulled).toBe(true);
+        // Verify the local repo has the new commit
+        const log = await git(projectDir, "log", "--oneline");
+        expect(log).toContain("add new file");
+    });
+    it("should pull when already up to date", async () => {
+        const { responses, send } = createSendCollector();
+        await handleGitPull(createPullRequest(), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.pulled).toBe(true);
+    });
+    it("should detect merge conflicts", async () => {
+        // Push a change to the remote from another clone
+        await writeFile(join(otherDir, "README.md"), "# Changed by other\n");
+        await git(otherDir, "add", "README.md");
+        await git(otherDir, "commit", "-m", "change readme from other");
+        await git(otherDir, "push", "origin", "master");
+        // Make a conflicting change locally
+        await writeFile(join(projectDir, "README.md"), "# Changed locally\n");
+        await git(projectDir, "add", "README.md");
+        await git(projectDir, "commit", "-m", "change readme locally");
+        const { responses, send } = createSendCollector();
+        await handleGitPull(createPullRequest(), send);
+        expect(responses).toHaveLength(1);
+        const resp = responses[0];
+        // Should resolve (not error) with conflicts
+        expect(resp.error).toBeUndefined();
+        expect(resp.payload).toBeDefined();
+        expect(resp.payload.pulled).toBe(false);
+        expect(resp.payload.conflicts).toBeDefined();
+        expect(resp.payload.conflicts.length).toBeGreaterThan(0);
+        // Clean up merge state
+        await git(projectDir, "merge", "--abort");
+    });
+    it("should error for non-existent project", async () => {
+        const msg = {
+            type: "git_pull",
+            requestId: "req-2",
+            sessionId: "non-existent-project",
+            payload: {},
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitPull(msg, send);
+        expect(responses).toHaveLength(1);
+        expect(responses[0].error).toBeDefined();
+        expect(responses[0].error.code).toBe(ErrorCode.INVALID_REQUEST);
+    });
+    it("should error for non-git directory", async () => {
+        const nonGitDir = join(tempDir, "non-git");
+        await mkdir(nonGitDir);
+        const project = createProject("non-git-project", nonGitDir);
+        const msg = {
+            type: "git_pull",
+            requestId: "req-3",
+            sessionId: project.project_id,
+            payload: {},
+        };
+        const { responses, send } = createSendCollector();
+        await handleGitPull(msg, send);
+        expect(responses).toHaveLength(1);
+        expect(responses[0].error).toBeDefined();
+        expect(responses[0].error.code).toBe(ErrorCode.GIT_NOT_INITIALIZED);
+    });
+    it("should pass requestId and send to gitPull for credential support", async () => {
+        // Push a commit so there's something to pull
+        await writeFile(join(otherDir, "cred-test.ts"), "export const c = 1;");
+        await git(otherDir, "add", "cred-test.ts");
+        await git(otherDir, "commit", "-m", "credential test");
+        await git(otherDir, "push", "origin", "master");
+        const { responses, send } = createSendCollector();
+        const request = createPullRequest();
+        await handleGitPull(request, send);
+        expect(responses).toHaveLength(1);
+        // Should succeed (local pull, no credentials needed)
+        expect(responses[0].error).toBeUndefined();
+        expect(responses[0].payload.pulled).toBe(true);
+    });
+});
+//# sourceMappingURL=git-pull.test.js.map

package/dist/handlers/__tests__/git-pull.test.js.map

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

package/dist/handlers/__tests__/git-push.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=git-push.test.d.ts.map

package/dist/handlers/__tests__/git-push.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-push.test.d.ts","sourceRoot":"","sources":["../../../src/handlers/__tests__/git-push.test.ts"],"names":[],"mappings":""}