@parall/cli 1.19.0 → 1.20.1

package/dist/commands/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmBpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QA6bnD"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QAicnD"}

package/dist/commands/mcp.js

@@ -1,8 +1,8 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import * as z from 'zod/v4';
-import { resolveCredentials } from '../lib/client.js';
-import { getWikiBlob, getWikiChangesetDiff, getWikiOutline, queryWiki, getWikiSection, getWikiTree, getWikiWorkspaceDiff, getWikiWorkspaceStatus, listWikis, proposeWikiChangeset, searchWiki, } from '../lib/wiki.js';
+import { resolveCredentials, resolveRuntimeContext } from '../lib/client.js';
+import { getWikiBlob, getWikiChangesetDiff, getWikiOutline, backfillProposedChangeset, queryWiki, getWikiSection, getWikiTree, getWikiWorkspaceDiff, getWikiWorkspaceStatus, listWikis, proposeWikiChangeset, searchWiki, } from '../lib/wiki.js';
 export function registerMcpCommands(program) {
     program
         .command('mcp')
@@ -419,13 +419,17 @@ export function registerMcpCommands(program) {
                 }).passthrough(),
             },
         }, async ({ wiki, title, message, changeset_id: changesetId, source_chat_id: sourceChatId, source_message_id: sourceMessageId, source_run_id: sourceRunId }) => {
+            const runtime = resolveRuntimeContext();
             const result = await proposeWikiChangeset(ctx, wiki, {
                 title,
                 message,
                 changesetId,
-                sourceChatId,
-                sourceMessageId,
-                sourceRunId,
+                sourceChatId: sourceChatId ?? runtime.chatId,
+                sourceMessageId: sourceMessageId ?? runtime.triggerMessageId,
+                sourceRunId: sourceRunId ?? runtime.sessionId,
+            });
+            await backfillProposedChangeset(ctx, runtime, result.changeset, {
+                includeComment: !changesetId,
             });
             return {
                 content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],

package/dist/commands/messages.js

@@ -17,9 +17,9 @@ export function registerMessageCommands(program) {
             const { client, orgId } = resolveCredentials();
             const params = { limit: Number(opts.limit) };
             if (opts.before !== undefined)
-                params.before = opts.before;
+                params.before = stripPrllScheme(opts.before);
             if (opts.after !== undefined)
-                params.after = opts.after;
+                params.after = stripPrllScheme(opts.after);
             if (opts.threadRootId !== undefined)
                 params.thread_root_id = stripPrllScheme(opts.threadRootId);
             if (opts.topLevel)
@@ -112,9 +112,9 @@ export function registerMessageCommands(program) {
             const { client } = resolveCredentials();
             const params = { limit: Number(opts.limit) };
             if (opts.before !== undefined)
-                params.before = opts.before;
+                params.before = stripPrllScheme(opts.before);
             if (opts.after !== undefined)
-                params.after = opts.after;
+                params.after = stripPrllScheme(opts.after);
             const result = await client.getMessageReplies(stripPrllScheme(messageId), params);
             printJson(result);
         }

package/dist/commands/projects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projects.d.ts","sourceRoot":"","sources":["../../src/commands/projects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QA6FvD"}
+{"version":3,"file":"projects.d.ts","sourceRoot":"","sources":["../../src/commands/projects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,QA8FvD"}

package/dist/commands/projects.js

@@ -1,5 +1,5 @@
 import { resolveCredentials } from '../lib/client.js';
-import { printJson, printError } from '../lib/output.js';
+import { printJson, printError, stripPrllScheme } from '../lib/output.js';
 export function registerProjectCommands(program) {
     const projects = program.command('projects').description('Manage projects');
     projects
@@ -22,7 +22,7 @@ export function registerProjectCommands(program) {
         .action(async (projectId) => {
         try {
             const { client, orgId } = resolveCredentials();
-            const result = await client.getProject(orgId, projectId);
+            const result = await client.getProject(orgId, stripPrllScheme(projectId));
             printJson(result);
         }
         catch (err) {
@@ -80,7 +80,7 @@ export function registerProjectCommands(program) {
             if (Object.keys(data).length === 0) {
                 printError(new Error('No fields to update. Provide at least one option.'));
             }
-            const result = await client.updateProject(orgId, projectId, data);
+            const result = await client.updateProject(orgId, stripPrllScheme(projectId), data);
             printJson(result);
         }
         catch (err) {
@@ -94,8 +94,9 @@ export function registerProjectCommands(program) {
         .action(async (projectId) => {
         try {
             const { client, orgId } = resolveCredentials();
-            await client.deleteProject(orgId, projectId);
-            printJson({ deleted: projectId });
+            const id = stripPrllScheme(projectId);
+            await client.deleteProject(orgId, id);
+            printJson({ deleted: id });
         }
         catch (err) {
             printError(err);

package/dist/commands/users.js

@@ -1,5 +1,5 @@
 import { resolveCredentials } from '../lib/client.js';
-import { printJson, printError } from '../lib/output.js';
+import { printJson, printError, stripPrllScheme } from '../lib/output.js';
 export function registerUserCommands(program) {
     // whoami — registered directly on program
     program
@@ -24,7 +24,7 @@ export function registerUserCommands(program) {
         .action(async (userId) => {
         try {
             const { client } = resolveCredentials();
-            const result = await client.getUser(userId);
+            const result = await client.getUser(stripPrllScheme(userId));
             printJson(result);
         }
         catch (err) {

package/dist/commands/wiki.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wiki.d.ts","sourceRoot":"","sources":["../../src/commands/wiki.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAwwBpD"}
+{"version":3,"file":"wiki.d.ts","sourceRoot":"","sources":["../../src/commands/wiki.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,QAmxBpD"}

package/dist/commands/wiki.js

@@ -1,6 +1,6 @@
 import { resolveCredentials, resolveRuntimeContext } from '../lib/client.js';
 import { printError, printJson } from '../lib/output.js';
-import { getAfcsDiff, getAfcsStatus, getWikiBlob, getWikiChangesetDetail, getWikiChangesetDiff, getWikiLog, getWikiOutline, getWikiSection, getWikiTree, listWikiChangesets, queryWiki, requestWikiAccess, resetWikiWorkspace, listWikis, proposeWikiChangeset, searchWiki, syncAllMounts, watchMounts, } from '../lib/wiki.js';
+import { getAfcsDiff, getAfcsStatus, getWikiBlob, getWikiChangesetDetail, getWikiChangesetDiff, getWikiLog, getWikiOutline, getWikiSection, getWikiTree, listWikiChangesets, queryWiki, requestWikiAccess, resetWikiWorkspace, backfillProposedChangeset, backfillMergedChangeset, listWikis, proposeWikiChangeset, searchWiki, syncAllMounts, watchMounts, } from '../lib/wiki.js';
 export function registerWikiCommands(program) {
     const wiki = program.command('wiki').description('Parall Wiki — read, edit, and propose changes');
     // ---- CRUD ----
@@ -41,6 +41,12 @@ export function registerWikiCommands(program) {
                 process.stderr.write(`wiki ${entry.slug} synced → ${entry.path}\n`);
             }
             printJson(result);
+            // Conflicts are an expected, agent-resolvable state; failures (download
+            // error, shape conflict, etc.) are not. Reflect that in the exit code
+            // so CI / scripts that check status see partial sync as failure.
+            if (!result.ok) {
+                process.exitCode = 1;
+            }
         }
         catch (error) {
             printError(error);
@@ -203,6 +209,9 @@ export function registerWikiCommands(program) {
                 sourceMessageId: options.messageId ?? rtx.triggerMessageId,
                 sourceRunId: options.sessionId ?? rtx.sessionId,
             });
+            await backfillProposedChangeset(ctx, rtx, result.changeset, {
+                includeComment: !options.update,
+            });
             const verb = options.update ? 'Re-proposed' : 'Created';
             process.stderr.write(`${verb} changeset ${result.changeset.id}\n`);
             process.stderr.write(`Changed files: ${result.changed_paths.join(', ')}\n`);
@@ -303,9 +312,11 @@ export function registerWikiCommands(program) {
         .action(async (changesetId, wikiRef) => {
         try {
             const ctx = resolveCredentials();
+            const rtx = resolveRuntimeContext();
             const { resolveWikiRefOrDefault } = await import('../lib/wiki.js');
             const wiki = await resolveWikiRefOrDefault(ctx, wikiRef);
             const result = await ctx.client.mergeWikiChangeset(ctx.orgId, wiki.id, changesetId);
+            await backfillMergedChangeset(ctx, rtx, result);
             process.stderr.write(`Merged changeset ${result.id} — "${result.title}"\n`);
             printJson(result);
         }

package/dist/lib/wiki.d.ts

@@ -1,4 +1,5 @@
 import { type ParallClient, type Wiki, type WikiChangeset, type WikiDiff, type WikiDiffFile, type WikiTreeEntry } from '@parall/sdk';
+import type { RuntimeContext } from './client.js';
 export type ParallContext = {
     client: ParallClient;
     orgId: string;
@@ -119,6 +120,15 @@ export type WikiProposeResult = {
     changeset: WikiChangeset;
     source: 'local_mount';
 };
+export type ChangesetBackfillMode = 'proposed' | 'merged';
+export type ChangesetTaskBackfillAttempt = {
+    task_id: string;
+    relation_created: boolean;
+    comment_created: boolean;
+};
+export type ChangesetTaskBackfillResult = {
+    attempts: ChangesetTaskBackfillAttempt[];
+};
 type WikiContentSource = 'local_mount' | 'api';
 export declare function listWikis(ctx: ParallContext): Promise<Wiki[]>;
 export declare function resolveWikiRef(ctx: ParallContext, wikiRef?: string): Promise<Wiki>;
@@ -194,6 +204,11 @@ export type AfcsDiffResult = {
 };
 export declare function getAfcsDiff(ctx: ParallContext, wikiRef?: string): Promise<AfcsDiffResult>;
 export declare function proposeWikiChangeset(ctx: ParallContext, wikiRef: string | undefined, options: WikiProposeOptions): Promise<WikiProposeResult>;
+export declare function backfillProposedChangeset(ctx: ParallContext, runtime: RuntimeContext, changeset: WikiChangeset, options?: {
+    relationType?: 'reference' | 'execution';
+    includeComment?: boolean;
+}): Promise<ChangesetTaskBackfillResult>;
+export declare function backfillMergedChangeset(ctx: ParallContext, runtime: RuntimeContext, changeset: WikiChangeset): Promise<ChangesetTaskBackfillResult>;
 /**
  * Discard all local changes and restore files to the last synced state.
  * Reads the local manifest and restores all files from the server.
@@ -245,11 +260,19 @@ export type AfcsLogResult = {
 };
 export declare function getWikiLog(ctx: ParallContext, wikiRef?: string, filePath?: string): Promise<AfcsLogResult>;
 export type SyncResult = {
-    ok: true;
+    /** True iff every wiki's per-path action ran without failure. Conflicts do
+     * NOT clear this flag — they are an expected, structured outcome the agent
+     * is responsible for resolving. Only `failed[]` (download error,
+     * shape-conflict, etc.) flips ok to false. */
+    ok: boolean;
     mounts: number;
     synced: {
         slug: string;
         path: string;
+        applied: number;
+        fastForwarded: number;
+        conflicts: SyncConflict[];
+        failed: SyncFailure[];
     }[];
 };
 /**
@@ -265,5 +288,96 @@ export declare function syncAllMounts(ctx: ParallContext): Promise<SyncResult>;
 export declare function watchMounts(ctx: ParallContext, intervalSec: number): {
     stop: () => void;
 };
+/**
+ * Sync a single wiki:
+ * 1. Fetch server manifest (file listing with SHAs)
+ * 2. Compare with local manifest
+ * 3. Download new/modified files via bulk download
+ * 4. Delete removed files
+ * 5. Save updated local manifest
+ */
+/** Per-path sync action computed by three-way comparison. */
+export type SyncAction = {
+    kind: 'noop';
+    path: string;
+} | {
+    kind: 'apply-write';
+    path: string;
+    remoteSha: string;
+    remoteSize: number;
+} | {
+    kind: 'apply-delete';
+    path: string;
+} | {
+    kind: 'fast-forward';
+    path: string;
+    remoteSha: string;
+    remoteSize: number;
+} | {
+    kind: 'fast-forward-delete';
+    path: string;
+} | {
+    kind: 'conflict-write';
+    path: string;
+    remoteSha: string;
+    remoteSize: number;
+    baseSha: string | null;
+    localSha: string | null;
+} | {
+    kind: 'conflict-delete';
+    path: string;
+    baseSha: string;
+};
+/**
+ * Pure three-way sync planner. Decides what to do per-path given the base
+ * (manifest entry from last successful sync), the current local working tree
+ * sha, and the latest remote sha. No I/O.
+ */
+export declare function planSyncActions(input: {
+    paths: Iterable<string>;
+    baseSha: (path: string) => string | null;
+    localSha: (path: string) => string | null;
+    remote: (path: string) => {
+        sha: string;
+        size: number;
+    } | null;
+}): SyncAction[];
+export type SyncConflict = {
+    path: string;
+    /** Where the upstream copy was written (or null for remote-deleted markers). */
+    remoteCopyPath: string | null;
+    /** Type of conflict for logging / UI surface. */
+    reason: 'remote-changed-local-edited' | 'remote-deleted-local-edited' | 'remote-added-local-collides' | 'remote-changed-local-deleted';
+};
+export type SyncFailure = {
+    path: string;
+    /**
+     * Reason classification:
+     *  - 'download'       — bulk-download endpoint surfaced a per-file error.
+     *  - 'shape-conflict' — local working tree has an incompatible file/directory
+     *                       shape at this path (e.g. local `foo` is a directory
+     *                       while remote treats `foo` as a file, or vice versa
+     *                       when remote is `foo/bar.md` but local has `foo` as
+     *                       a regular file).
+     */
+    reason: 'download' | 'shape-conflict';
+    /** Server-supplied error string or local errno, when available. */
+    detail?: string;
+};
+export type WikiSyncOutcome = {
+    applied: number;
+    fastForwarded: number;
+    conflicts: SyncConflict[];
+    /** Per-path failures that prevented a planned action from running. Manifest is left unchanged for these — next sync retries. */
+    failed: SyncFailure[];
+};
+export declare function syncSingleWiki(ctx: ParallContext, wiki: import('@parall/sdk').Wiki, mountPath: string): Promise<WikiSyncOutcome>;
+/**
+ * Write a sync conflict marker under .parall-wiki/conflicts/, mirroring the
+ * source path so the agent (or user) can locate the upstream copy next to the
+ * local edit. Returns the absolute path written.
+ */
+export declare function writeConflictMarker(mountRoot: string, sourcePath: string, suffix: string, content: Buffer): Promise<string>;
+export declare function computeGitBlobSHA(content: Buffer): string;
 export {};
 //# sourceMappingURL=wiki.d.ts.map

package/dist/lib/wiki.d.ts.map

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

package/dist/lib/wiki.js

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { ApiError, } from '@parall/sdk';
+import { ApiError, COMMENT_TARGET, } from '@parall/sdk';
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -10,6 +10,9 @@ const TRAILING_FENCE_RE = /\s+#+\s*$/;
 const LOCAL_NODE_SECTION_ARTIFACT_VERSION = 2;
 const LOCAL_MANIFEST_FILE = 'manifest.json';
 const PRLL_WIKI_DIR = '.parall-wiki';
+const CONFLICTS_DIR = 'conflicts';
+const REMOTE_CONFLICT_SUFFIX = '.remote';
+const REMOTE_DELETED_MARKER_SUFFIX = '.remote-deleted';
 // ---------------------------------------------------------------------------
 // Wiki resolution helpers
 // ---------------------------------------------------------------------------
@@ -347,6 +350,96 @@ export async function proposeWikiChangeset(ctx, wikiRef, options) {
         source: 'local_mount',
     };
 }
+// backfillProposedChangeset attaches the current runtime's task to a
+// freshly-proposed changeset: one relation (task → changeset) and a no_reply
+// "Proposed" comment on the task. Best-effort: failures are logged and
+// swallowed so the propose action itself stays authoritative.
+export async function backfillProposedChangeset(ctx, runtime, changeset, options = {}) {
+    const step = await resolveRuntimeTaskStep(ctx, runtime);
+    if (!step?.target_id) {
+        return { attempts: [] };
+    }
+    const taskId = step.target_id;
+    const sessionId = normalizeOptionalString(runtime.sessionId);
+    const agentId = resolveAgentId(ctx.agentId);
+    const attempt = {
+        task_id: taskId,
+        relation_created: false,
+        comment_created: false,
+    };
+    try {
+        await ctx.client.createTaskRelation(ctx.orgId, taskId, {
+            target_type: 'wiki_changeset',
+            target_id: changeset.id,
+            relation_type: options.relationType ?? 'reference',
+        });
+        attempt.relation_created = true;
+    }
+    catch (err) {
+        process.stderr.write(`warning: changeset ${changeset.id} relation backfill to task ${taskId} failed: ${formatBackfillError(err)}\n`);
+    }
+    if (options.includeComment !== false && sessionId && agentId) {
+        try {
+            await ctx.client.createAgentTaskBackfillComment(ctx.orgId, agentId, sessionId, {
+                task_id: taskId,
+                body: buildChangesetTaskComment(changeset, 'proposed'),
+            });
+            attempt.comment_created = true;
+        }
+        catch (err) {
+            process.stderr.write(`warning: changeset ${changeset.id} "Proposed" comment backfill to task ${taskId} failed: ${formatBackfillError(err)}\n`);
+        }
+    }
+    return { attempts: [attempt] };
+}
+// backfillMergedChangeset posts a no_reply "Merged" comment on every task that
+// was linked to the changeset at propose time. It does NOT consult the
+// merging runtime's current task: that task may be unrelated to the
+// changeset, and recording the merge there would leak wrong context.
+// If no task was ever linked (e.g. changeset proposed via UI/human), this
+// quietly does nothing.
+export async function backfillMergedChangeset(ctx, runtime, changeset) {
+    const sessionId = normalizeOptionalString(runtime.sessionId);
+    const agentId = resolveAgentId(ctx.agentId);
+    if (!sessionId || !agentId) {
+        return { attempts: [] };
+    }
+    let relations;
+    try {
+        relations = await ctx.client.listTaskRelationsByTarget(ctx.orgId, {
+            target_type: 'wiki_changeset',
+            target_id: changeset.id,
+        });
+    }
+    catch (err) {
+        process.stderr.write(`warning: changeset ${changeset.id} merge backfill could not list task relations: ${formatBackfillError(err)}\n`);
+        return { attempts: [] };
+    }
+    const taskIds = Array.from(new Set(relations.map((r) => r.task_id)));
+    if (taskIds.length === 0) {
+        return { attempts: [] };
+    }
+    const attempts = [];
+    for (const taskId of taskIds) {
+        const attempt = {
+            task_id: taskId,
+            relation_created: true, // relation already exists — that's how we found this task
+            comment_created: false,
+        };
+        try {
+            await ctx.client.createAgentTaskBackfillComment(ctx.orgId, agentId, sessionId, {
+                task_id: taskId,
+                body: buildChangesetTaskComment(changeset, 'merged'),
+            });
+            attempt.comment_created = true;
+        }
+        catch (err) {
+            process.stderr.write(`warning: changeset ${changeset.id} "Merged" comment backfill to task ${taskId} failed: ${formatBackfillError(err)}\n`);
+        }
+        attempts.push(attempt);
+    }
+    return { attempts };
+}
 // ---------------------------------------------------------------------------
 // AFCS: reset workspace
 // ---------------------------------------------------------------------------
@@ -473,11 +566,19 @@ export async function syncAllMounts(ctx) {
     for (const wiki of wikis) {
         const mountPath = resolveMountPath(wiki.slug, mountRoot);
         activeMountPaths.add(mountPath);
-        await syncSingleWiki(ctx, wiki, mountPath);
-        synced.push({ slug: wiki.slug, path: mountPath });
+        const outcome = await syncSingleWiki(ctx, wiki, mountPath);
+        synced.push({
+            slug: wiki.slug,
+            path: mountPath,
+            applied: outcome.applied,
+            fastForwarded: outcome.fastForwarded,
+            conflicts: outcome.conflicts,
+            failed: outcome.failed,
+        });
     }
     await pruneStaleMounts(mountRoot, activeMountPaths);
-    return { ok: true, mounts: wikis.length, synced };
+    const ok = synced.every((s) => s.failed.length === 0);
+    return { ok, mounts: wikis.length, synced };
 }
 /**
  * Run {@link syncAllMounts} in a loop, sleeping `intervalSec` between
@@ -505,18 +606,50 @@ export function watchMounts(ctx, intervalSec) {
     process.on('SIGTERM', stop);
     return { stop };
 }
-// ---------------------------------------------------------------------------
-// Sync internals (REST-based)
-// ---------------------------------------------------------------------------
 /**
- * Sync a single wiki:
- * 1. Fetch server manifest (file listing with SHAs)
- * 2. Compare with local manifest
- * 3. Download new/modified files via bulk download
- * 4. Delete removed files
- * 5. Save updated local manifest
+ * Pure three-way sync planner. Decides what to do per-path given the base
+ * (manifest entry from last successful sync), the current local working tree
+ * sha, and the latest remote sha. No I/O.
  */
-async function syncSingleWiki(ctx, wiki, mountPath) {
+export function planSyncActions(input) {
+    const actions = [];
+    for (const p of input.paths) {
+        const baseSha = input.baseSha(p);
+        const remote = input.remote(p);
+        const remoteSha = remote?.sha ?? null;
+        const localSha = input.localSha(p);
+        if (baseSha === remoteSha) {
+            actions.push({ kind: 'noop', path: p });
+            continue;
+        }
+        const cleanLocal = localSha === baseSha;
+        if (cleanLocal) {
+            if (remoteSha === null) {
+                actions.push({ kind: 'apply-delete', path: p });
+            }
+            else {
+                actions.push({ kind: 'apply-write', path: p, remoteSha, remoteSize: remote.size });
+            }
+            continue;
+        }
+        if (localSha !== null && localSha === remoteSha) {
+            actions.push({ kind: 'fast-forward', path: p, remoteSha, remoteSize: remote.size });
+            continue;
+        }
+        if (localSha === null && remoteSha === null) {
+            actions.push({ kind: 'fast-forward-delete', path: p });
+            continue;
+        }
+        if (remoteSha === null) {
+            actions.push({ kind: 'conflict-delete', path: p, baseSha: baseSha });
+        }
+        else {
+            actions.push({ kind: 'conflict-write', path: p, remoteSha, remoteSize: remote.size, baseSha, localSha });
+        }
+    }
+    return actions;
+}
+export async function syncSingleWiki(ctx, wiki, mountPath) {
     await fs.mkdir(mountPath, { recursive: true });
     const metaDir = path.join(mountPath, PRLL_WIKI_DIR);
     await fs.mkdir(metaDir, { recursive: true });
@@ -524,54 +657,306 @@ async function syncSingleWiki(ctx, wiki, mountPath) {
     const baseUrl = (ctx.baseUrl ?? process.env.PRLL_WIKI_URL ?? process.env.PRLL_API_URL ?? '').replace(/\/+$/, '');
     const manifestUrl = `${baseUrl}/wiki/v1/orgs/${ctx.orgId}/wikis/${wiki.id}/manifest`;
     const bulkDownloadUrl = `${baseUrl}/wiki/v1/orgs/${ctx.orgId}/wikis/${wiki.id}/files/bulk-download`;
-    // 1. Fetch server manifest
+    // 1. Fetch server manifest + read local manifest.
     const manifestResp = await wikiServiceFetch(manifestUrl, token);
     const serverEntries = manifestResp.data;
-    // 2. Read local manifest
-    const localManifest = await readLocalManifest(mountPath);
-    // 3. Compare: find new, modified, deleted files
     const serverByPath = new Map(serverEntries.map((e) => [e.path, e]));
-    const toDownload = [];
-    const toDelete = [];
-    for (const entry of serverEntries) {
-        const local = localManifest.files[entry.path];
-        if (!local || local.sha !== entry.sha) {
-            toDownload.push(entry.path);
+    const localManifest = await readLocalManifest(mountPath);
+    // 2. Build the union of paths from server + local manifest + working tree.
+    const allPaths = new Set();
+    for (const e of serverEntries)
+        allPaths.add(e.path);
+    for (const p of Object.keys(localManifest.files))
+        allPaths.add(p);
+    await walkLocalFiles(mountPath, mountPath, async (_full, rel) => {
+        allPaths.add(rel);
+    });
+    // 3. Snapshot working-tree shas so the planner stays pure. Paths whose local
+    // shape is incompatible with a regular-file read (e.g. local has a directory
+    // where remote treats this as a file, or a parent path is a regular file
+    // while remote nests under it) are routed to a 'shape-conflict' failure
+    // instead of crashing the whole sync — they need human/agent intervention.
+    const localShaCache = new Map();
+    const shapeConflictByPath = new Map();
+    for (const p of allPaths) {
+        const probe = await probeLocalGitBlob(mountPath, p);
+        if (probe.kind === 'shape-conflict') {
+            shapeConflictByPath.set(p, probe.detail);
+            localShaCache.set(p, null);
         }
-    }
-    for (const localPath of Object.keys(localManifest.files)) {
-        if (!serverByPath.has(localPath)) {
-            toDelete.push(localPath);
+        else {
+            localShaCache.set(p, probe.sha);
         }
     }
-    // 4. Bulk download changed files
-    if (toDownload.length > 0) {
-        const downloaded = await bulkDownloadFiles(bulkDownloadUrl, token, toDownload);
+    const actions = planSyncActions({
+        paths: allPaths,
+        baseSha: (p) => localManifest.files[p]?.sha ?? null,
+        localSha: (p) => localShaCache.get(p) ?? null,
+        remote: (p) => {
+            const r = serverByPath.get(p);
+            return r ? { sha: r.sha, size: r.size } : null;
+        },
+    });
+    // 4. Fetch all bytes we need (apply-write + conflict-write) in one bulk call.
+    const fetchPaths = actions
+        .filter((a) => a.kind === 'apply-write' || a.kind === 'conflict-write')
+        .map((a) => a.path);
+    const contentByPath = new Map();
+    const downloadErrorByPath = new Map();
+    if (fetchPaths.length > 0) {
+        const downloaded = await bulkDownloadFiles(bulkDownloadUrl, token, fetchPaths);
+        const returnedPaths = new Set();
         for (const entry of downloaded) {
-            const fullPath = resolvePathInsideRoot(mountPath, entry.path);
-            await fs.mkdir(path.dirname(fullPath), { recursive: true });
-            await fs.writeFile(fullPath, Buffer.from(entry.content_base64, 'base64'));
+            returnedPaths.add(entry.path);
+            if (entry.error) {
+                downloadErrorByPath.set(entry.path, entry.error);
+                continue;
+            }
+            contentByPath.set(entry.path, Buffer.from(entry.content_base64, 'base64'));
+        }
+        // Anything we asked for but the server omitted entirely is also a failure.
+        for (const p of fetchPaths) {
+            if (!returnedPaths.has(p)) {
+                downloadErrorByPath.set(p, 'missing from bulk-download response');
+            }
         }
     }
-    // 5. Delete removed files
-    for (const deletePath of toDelete) {
-        const fullPath = resolvePathInsideRoot(mountPath, deletePath);
-        await fs.rm(fullPath, { force: true });
-        await removeEmptyParents(mountPath, path.dirname(fullPath));
+    // 5. Apply actions and start with the previous manifest, mutating per action.
+    const newFiles = { ...localManifest.files };
+    const conflicts = [];
+    const failed = [];
+    let applied = 0;
+    let fastForwarded = 0;
+    // Surface shape conflicts as sync failures up front so we don't try to write
+    // through them. Manifest stays pinned (the path's manifest entry is left as-is).
+    for (const [p, detail] of shapeConflictByPath) {
+        failed.push({ path: p, reason: 'shape-conflict', detail });
+    }
+    for (const action of actions) {
+        if (shapeConflictByPath.has(action.path)) {
+            // Already reported. Don't attempt apply / write — would crash on EISDIR/ENOTDIR.
+            continue;
+        }
+        switch (action.kind) {
+            case 'noop':
+                // Preserve manifest entry unchanged.
+                break;
+            case 'apply-write': {
+                const buf = contentByPath.get(action.path);
+                if (!buf) {
+                    failed.push({
+                        path: action.path,
+                        reason: 'download',
+                        detail: downloadErrorByPath.get(action.path),
+                    });
+                    break;
+                }
+                // TOCTOU re-check: the snapshot was taken before the bulk-download
+                // network round-trip. If the user/agent edited (or deleted) this path
+                // in that window, demote to a conflict so we don't silently overwrite.
+                const snapshotSha = localShaCache.get(action.path) ?? null;
+                const reprobe = await probeLocalGitBlob(mountPath, action.path);
+                if (reprobe.kind === 'shape-conflict') {
+                    failed.push({ path: action.path, reason: 'shape-conflict', detail: reprobe.detail });
+                    break;
+                }
+                const currentSha = reprobe.sha;
+                if (currentSha === action.remoteSha) {
+                    // Local converged on remote during the window — manifest-only fast-forward.
+                    newFiles[action.path] = { sha: action.remoteSha, size: action.remoteSize };
+                    fastForwarded++;
+                    break;
+                }
+                if (currentSha !== snapshotSha) {
+                    // Local diverged after snapshot. Surface as a conflict instead of overwriting.
+                    const remoteCopy = await writeConflictMarker(mountPath, action.path, REMOTE_CONFLICT_SUFFIX, buf);
+                    let reason;
+                    // Defense-in-depth: planSyncActions only emits apply-write when
+                    // localSha === baseSha (both non-null), so snapshotSha should never
+                    // be null here. The branch is kept to safely classify any race that
+                    // creates a file between snapshot and apply.
+                    if (snapshotSha === null && currentSha !== null) {
+                        reason = 'remote-added-local-collides';
+                    }
+                    else if (currentSha === null) {
+                        reason = 'remote-changed-local-deleted';
+                    }
+                    else {
+                        reason = 'remote-changed-local-edited';
+                    }
+                    conflicts.push({ path: action.path, remoteCopyPath: remoteCopy, reason });
+                    break;
+                }
+                const fullPath = resolvePathInsideRoot(mountPath, action.path);
+                await fs.mkdir(path.dirname(fullPath), { recursive: true });
+                await fs.writeFile(fullPath, buf);
+                newFiles[action.path] = { sha: action.remoteSha, size: action.remoteSize };
+                applied++;
+                break;
+            }
+            case 'apply-delete': {
+                // TOCTOU re-check before deleting. The action only fires when the
+                // snapshot saw clean local matching the (now-deleted) base; if the
+                // user re-created or edited the file after the snapshot, demote to
+                // conflict-delete instead of dropping their work.
+                const snapshotSha = localShaCache.get(action.path) ?? null;
+                const reprobe = await probeLocalGitBlob(mountPath, action.path);
+                if (reprobe.kind === 'shape-conflict') {
+                    failed.push({ path: action.path, reason: 'shape-conflict', detail: reprobe.detail });
+                    break;
+                }
+                const currentSha = reprobe.sha;
+                if (currentSha === null) {
+                    // Convergence: user also deleted the file during the TOCTOU window.
+                    // Both sides agree — fast-forward the manifest delete.
+                    delete newFiles[action.path];
+                    fastForwarded++;
+                    break;
+                }
+                if (currentSha !== snapshotSha) {
+                    await writeConflictMarker(mountPath, action.path, REMOTE_DELETED_MARKER_SUFFIX, Buffer.alloc(0));
+                    conflicts.push({
+                        path: action.path,
+                        remoteCopyPath: null,
+                        reason: 'remote-deleted-local-edited',
+                    });
+                    break;
+                }
+                const fullPath = resolvePathInsideRoot(mountPath, action.path);
+                await fs.rm(fullPath, { force: true });
+                await removeEmptyParents(mountPath, path.dirname(fullPath));
+                delete newFiles[action.path];
+                applied++;
+                break;
+            }
+            case 'fast-forward':
+                // Local already matches remote — only sync the manifest pointer.
+                newFiles[action.path] = { sha: action.remoteSha, size: action.remoteSize };
+                fastForwarded++;
+                break;
+            case 'fast-forward-delete':
+                delete newFiles[action.path];
+                fastForwarded++;
+                break;
+            case 'conflict-write': {
+                const buf = contentByPath.get(action.path);
+                if (!buf) {
+                    failed.push({
+                        path: action.path,
+                        reason: 'download',
+                        detail: downloadErrorByPath.get(action.path),
+                    });
+                    break;
+                }
+                const remoteCopy = await writeConflictMarker(mountPath, action.path, REMOTE_CONFLICT_SUFFIX, buf);
+                // Reason classification:
+                //  - base null + local present  → both sides added the same path with different bytes
+                //  - base present + local null  → user deleted locally, server changed it
+                //  - base present + local present (and ≠ both) → genuine concurrent edit
+                let reason;
+                if (action.baseSha === null) {
+                    reason = 'remote-added-local-collides';
+                }
+                else if (action.localSha === null) {
+                    reason = 'remote-changed-local-deleted';
+                }
+                else {
+                    reason = 'remote-changed-local-edited';
+                }
+                conflicts.push({ path: action.path, remoteCopyPath: remoteCopy, reason });
+                // Manifest entry stays at its pre-sync value so the next sync still
+                // recognises the local edit and re-tries the merge.
+                break;
+            }
+            case 'conflict-delete': {
+                // Server deleted a file the user has local edits for. Drop a marker
+                // so the agent surfaces the divergence without overwriting local.
+                await writeConflictMarker(mountPath, action.path, REMOTE_DELETED_MARKER_SUFFIX, Buffer.alloc(0));
+                conflicts.push({
+                    path: action.path,
+                    remoteCopyPath: null,
+                    reason: 'remote-deleted-local-edited',
+                });
+                break;
+            }
+        }
     }
-    // 6. Save updated local manifest
+    // 6. Persist new manifest.
     const newManifest = {
         wiki_id: wiki.id,
         synced_at: new Date().toISOString(),
-        files: {},
+        files: newFiles,
     };
-    for (const entry of serverEntries) {
-        newManifest.files[entry.path] = {
-            sha: entry.sha,
-            size: entry.size,
-        };
-    }
     await writeLocalManifest(mountPath, newManifest);
+    if (conflicts.length > 0) {
+        for (const c of conflicts) {
+            const where = c.remoteCopyPath ? ` → ${path.relative(mountPath, c.remoteCopyPath)}` : '';
+            console.warn(`[wiki sync] conflict on ${c.path} (${c.reason})${where}`);
+        }
+    }
+    if (failed.length > 0) {
+        for (const f of failed) {
+            const detail = f.detail ? ` — ${f.detail}` : '';
+            console.warn(`[wiki sync] failed to ${f.reason} ${f.path}${detail} — manifest unchanged, will retry next sync`);
+        }
+    }
+    return { applied, fastForwarded, conflicts, failed };
+}
+/** Compute the git blob SHA of a working-tree file, or null if absent. */
+async function readLocalGitBlobSha(mountRoot, relPath) {
+    const probe = await probeLocalGitBlob(mountRoot, relPath);
+    if (probe.kind === 'shape-conflict') {
+        // Surface as throw at this entry point — the caller (computeLocalChanges /
+        // computeLocalDiff) doesn't currently model shape conflicts. syncSingleWiki
+        // uses probeLocalGitBlob directly so it can route the failure structurally.
+        throw new Error(`shape conflict at ${relPath}: ${probe.detail}`);
+    }
+    return probe.sha;
+}
+/**
+ * Read a working-tree file as a git blob, returning a structured shape so
+ * callers can distinguish "absent" from "shape mismatch" (directory where a
+ * file is expected, or a parent path is a file blocking nested reads).
+ */
+async function probeLocalGitBlob(mountRoot, relPath) {
+    let fullPath;
+    try {
+        fullPath = resolvePathInsideRoot(mountRoot, relPath);
+    }
+    catch {
+        return { kind: 'absent', sha: null };
+    }
+    try {
+        const buf = await fs.readFile(fullPath);
+        return { kind: 'file', sha: computeGitBlobSHA(buf) };
+    }
+    catch (err) {
+        const code = err.code;
+        if (code === 'ENOENT')
+            return { kind: 'absent', sha: null };
+        if (code === 'EISDIR' || code === 'ENOTDIR') {
+            return { kind: 'shape-conflict', detail: code };
+        }
+        throw err;
+    }
+}
+/**
+ * Write a sync conflict marker under .parall-wiki/conflicts/, mirroring the
+ * source path so the agent (or user) can locate the upstream copy next to the
+ * local edit. Returns the absolute path written.
+ */
+export async function writeConflictMarker(mountRoot, sourcePath, suffix, content) {
+    // Validate sourcePath under the mount root before we use it as a key under
+    // .parall-wiki/conflicts. The planner only feeds us paths the server returned
+    // (so traversal segments are not expected today), but the rest of the sync
+    // pipeline always goes through resolvePathInsideRoot and we want this branch
+    // to fail closed too — defense in depth, not exploitation today.
+    resolvePathInsideRoot(mountRoot, sourcePath);
+    const conflictsRoot = path.join(mountRoot, PRLL_WIKI_DIR, CONFLICTS_DIR);
+    const target = resolvePathInsideRoot(conflictsRoot, sourcePath + suffix);
+    await fs.mkdir(path.dirname(target), { recursive: true });
+    await fs.writeFile(target, content);
+    return target;
 }
 // ---------------------------------------------------------------------------
 // Local manifest I/O
@@ -647,7 +1032,7 @@ async function bulkDownloadFiles(bulkDownloadUrl, token, paths) {
 // ---------------------------------------------------------------------------
 // Local change detection (manifest-based)
 // ---------------------------------------------------------------------------
-function computeGitBlobSHA(content) {
+export function computeGitBlobSHA(content) {
     // Manifest SHAs come from Gitea's Git blob object IDs, not raw content hashes.
     // This matches Git's current SHA-1 blob format; if the server ever switches to
     // SHA-256 object IDs, this helper must change in lockstep.
@@ -1741,6 +2126,38 @@ function normalizeOptionalString(value) {
     const normalized = value?.trim();
     return normalized ? normalized : undefined;
 }
+async function resolveRuntimeTaskStep(ctx, runtime) {
+    const sessionId = normalizeOptionalString(runtime.sessionId);
+    const stepId = normalizeOptionalString(runtime.stepId);
+    const agentId = resolveAgentId(ctx.agentId);
+    if (!sessionId || !stepId || !agentId) {
+        return null;
+    }
+    try {
+        const step = await ctx.client.getAgentSessionStep(ctx.orgId, agentId, sessionId, stepId);
+        if (step.target_type !== 'task' || !step.target_id) {
+            return null;
+        }
+        return step;
+    }
+    catch {
+        return null;
+    }
+}
+function buildChangesetTaskComment(changeset, mode) {
+    const verb = mode === 'merged' ? 'Merged wiki changeset' : 'Proposed wiki changeset';
+    const normalizedTitle = changeset.title.replace(/\s+/g, ' ').trim();
+    return `${verb}: [changeset ${changeset.id}](${COMMENT_TARGET.changeset(changeset.id, changeset.wiki_id)}) - ${normalizedTitle}`;
+}
+function formatBackfillError(err) {
+    if (err instanceof ApiError) {
+        return `${err.code ?? err.status} ${err.message}`;
+    }
+    if (err instanceof Error) {
+        return err.message;
+    }
+    return String(err);
+}
 async function pathExists(target) {
     try {
         await fs.access(target);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parall/cli",
-  "version": "1.19.0",
+  "version": "1.20.1",
   "description": "CLI client for Parall — universal agent & human access to Parall API",
   "license": "MIT",
   "repository": {
@@ -30,7 +30,7 @@
     "@modelcontextprotocol/sdk": "1.27.1",
     "commander": "^13.0.0",
     "zod": "^4.3.6",
-    "@parall/sdk": "1.19.0"
+    "@parall/sdk": "1.20.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
@@ -38,6 +38,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "dev": "tsc --watch"
+    "dev": "tsc --watch",
+    "test": "pnpm run build && node --test test/*.test.mjs"
   }
 }