@ship-cli/core 0.1.11 → 0.1.13

package/dist/bin.js

@@ -188905,6 +188905,28 @@ var restackCommand = make58(
       return;
     }
     const { vcs } = vcsCheck;
+    const defaultBranch = yield* getDefaultBranch();
+    if (!json2) {
+      yield* log3("Fetching from remote...");
+    }
+    const fetchResult = yield* vcs.fetch().pipe(
+      map17(() => ({ success: true })),
+      catchAll2((e2) => succeed7({ success: false, error: formatEffectError(e2) }))
+    );
+    if (!fetchResult.success) {
+      const output2 = {
+        fetched: false,
+        restacked: false,
+        pushed: false,
+        error: fetchResult.error
+      };
+      if (json2) {
+        yield* log3(JSON.stringify(output2, null, 2));
+      } else {
+        yield* outputError(`Fetch failed: ${fetchResult.error}`, json2);
+      }
+      return;
+    }
     const stack2 = yield* vcs.getStack().pipe(
       catchAll2((e2) => {
         return succeed7({ error: formatEffectError(e2), changes: [] });
@@ -188921,11 +188943,15 @@ var restackCommand = make58(
         catchAll2(() => succeed7({ success: false }))
       );
       const output2 = trunkResult2.success ? {
+        fetched: true,
         restacked: false,
+        pushed: false,
         stackSize: 0,
         trunkChangeId: trunkResult2.trunk.shortChangeId
       } : {
+        fetched: true,
         restacked: false,
+        pushed: false,
         stackSize: 0
       };
       if (json2) {
@@ -188938,8 +188964,10 @@ var restackCommand = make58(
       }
       return;
     }
+    if (!json2) {
+      yield* log3("Rebasing stack onto trunk...");
+    }
     const firstInStack = changes2[changes2.length - 1];
-    const defaultBranch = yield* getDefaultBranch();
     const rebaseResult = yield* vcs.rebase(firstInStack.id, defaultBranch).pipe(
       map17(() => ({ success: true, conflicted: false })),
       catchTag2(
@@ -188952,7 +188980,9 @@ var restackCommand = make58(
     );
     if (!rebaseResult.success) {
       const output2 = {
+        fetched: true,
         restacked: false,
+        pushed: false,
         error: rebaseResult.error
       };
       if (json2) {
@@ -188962,43 +188992,96 @@ var restackCommand = make58(
       }
       return;
     }
+    if (rebaseResult.conflicted) {
+      const stackAfter2 = yield* vcs.getStack().pipe(
+        map17((s) => s.length),
+        catchAll2(() => succeed7(changes2.length))
+      );
+      const trunkResult2 = yield* vcs.getTrunkInfo().pipe(
+        map17((trunk) => ({ success: true, trunk })),
+        catchAll2(() => succeed7({ success: false }))
+      );
+      const output2 = {
+        fetched: true,
+        restacked: true,
+        pushed: false,
+        stackSize: stackAfter2,
+        trunkChangeId: trunkResult2.success ? trunkResult2.trunk.shortChangeId : void 0,
+        conflicted: true
+      };
+      if (json2) {
+        yield* log3(JSON.stringify(output2, null, 2));
+      } else {
+        yield* log3("Restack completed with conflicts!");
+        yield* log3(`  Fetched: yes`);
+        yield* log3(`  Rebased: yes (with conflicts)`);
+        if (trunkResult2.success) {
+          yield* log3(`  Trunk:   ${trunkResult2.trunk.shortChangeId.slice(0, 12)}`);
+        }
+        yield* log3(`  Stack:   ${stackAfter2} change(s)`);
+        yield* log3(`  Pushed:  no (conflicts must be resolved first)`);
+        yield* log3("");
+        yield* log3("Resolve conflicts with 'jj status' and edit the conflicted files.");
+        yield* log3("Then run 'ship stack restack' again to push.");
+      }
+      return;
+    }
+    if (!json2) {
+      yield* log3("Pushing bookmarks...");
+    }
     const stackAfter = yield* vcs.getStack().pipe(
-      map17((s) => s.length),
-      catchAll2(() => succeed7(changes2.length))
+      catchAll2(() => succeed7([]))
     );
+    const bookmarksToPush = stackAfter.flatMap((c) => c.bookmarks).filter((b3) => b3 && b3.length > 0);
+    const pushedBookmarks = [];
+    for (const bookmark of bookmarksToPush) {
+      const pushResult = yield* vcs.push(bookmark).pipe(
+        map17(() => ({ success: true })),
+        catchAll2((e2) => succeed7({ success: false, error: formatEffectError(e2) }))
+      );
+      pushedBookmarks.push({
+        bookmark,
+        success: pushResult.success,
+        error: "error" in pushResult ? pushResult.error : void 0
+      });
+    }
+    const allPushed = pushedBookmarks.every((p4) => p4.success);
+    const anyPushed = pushedBookmarks.some((p4) => p4.success);
     const trunkResult = yield* vcs.getTrunkInfo().pipe(
       map17((trunk) => ({ success: true, trunk })),
       catchAll2(() => succeed7({ success: false }))
     );
-    const output = trunkResult.success ? {
-      restacked: true,
-      stackSize: stackAfter,
-      trunkChangeId: trunkResult.trunk.shortChangeId,
-      conflicted: rebaseResult.conflicted
-    } : {
+    const output = {
+      fetched: true,
       restacked: true,
-      stackSize: stackAfter,
-      conflicted: rebaseResult.conflicted
+      pushed: anyPushed,
+      stackSize: stackAfter.length,
+      trunkChangeId: trunkResult.success ? trunkResult.trunk.shortChangeId : void 0,
+      conflicted: false,
+      pushedBookmarks: pushedBookmarks.length > 0 ? pushedBookmarks : void 0
     };
     if (json2) {
       yield* log3(JSON.stringify(output, null, 2));
     } else {
-      if (rebaseResult.conflicted) {
-        yield* log3("Restack completed with conflicts!");
-        yield* log3(`  Rebased: yes (with conflicts)`);
-        if (trunkResult.success) {
-          yield* log3(`  Trunk:   ${trunkResult.trunk.shortChangeId.slice(0, 12)}`);
+      yield* log3("Restack completed successfully.");
+      yield* log3(`  Fetched: yes`);
+      yield* log3(`  Rebased: ${changes2.length} change(s)`);
+      if (trunkResult.success) {
+        yield* log3(`  Trunk:   ${trunkResult.trunk.shortChangeId.slice(0, 12)}`);
+      }
+      yield* log3(`  Stack:   ${stackAfter.length} change(s)`);
+      if (pushedBookmarks.length > 0) {
+        const successCount = pushedBookmarks.filter((p4) => p4.success).length;
+        yield* log3(`  Pushed:  ${successCount}/${pushedBookmarks.length} bookmark(s)`);
+        if (!allPushed) {
+          yield* log3("");
+          yield* log3("Failed to push:");
+          for (const p4 of pushedBookmarks.filter((p5) => !p5.success)) {
+            yield* log3(`  - ${p4.bookmark}: ${p4.error}`);
+          }
         }
-        yield* log3(`  Stack:   ${stackAfter} change(s)`);
-        yield* log3("");
-        yield* log3("Resolve conflicts with 'jj status' and edit the conflicted files.");
       } else {
-        yield* log3("Restack completed successfully.");
-        yield* log3(`  Rebased: ${changes2.length} change(s)`);
-        if (trunkResult.success) {
-          yield* log3(`  Trunk:   ${trunkResult.trunk.shortChangeId.slice(0, 12)}`);
-        }
-        yield* log3(`  Stack:   ${stackAfter} change(s)`);
+        yield* log3(`  Pushed:  no bookmarks to push`);
       }
     }
   })
@@ -190140,7 +190223,7 @@ Commands:
   describe          Update change description
   bookmark          Create or move a bookmark on current change
   sync              Fetch and rebase onto trunk
-  restack           Rebase entire stack onto trunk (no fetch)
+  restack           Fetch, rebase, and push entire stack
   submit            Push and create/update PR
   squash            Squash current change into parent
   abandon           Abandon a change
@@ -190310,7 +190393,7 @@ Repository: ${repoName}
 Title: ${prTitle}
 URL: ${prUrl}
 
-\u2192 Action: Run stack-sync --auto-submit to rebase and push dependent PRs`;
+\u2192 Action: Run stack-restack to rebase and push dependent PRs`;
       }
       return `[GitHub] PR #${prNumber} closed (not merged) by @${senderLogin}
 
@@ -192815,7 +192898,7 @@ var command = ship.pipe(
     prCommand
   ])
 );
-var version = "0.1.11" ;
+var version = "0.1.13" ;
 var run9 = run8(command, {
   name: "ship",
   version
@@ -194504,7 +194587,7 @@ All support optional \`workdir\` param.
 | Action | Params | Description |
 |--------|--------|-------------|
 | \`stack-sync\` | - | Fetch + rebase onto trunk |
-| \`stack-restack\` | - | Rebase onto trunk (no fetch) |
+| \`stack-restack\` | - | Fetch + rebase + push entire stack |
 | \`stack-create\` | message?, bookmark?, noWorkspace? | New change (creates workspace by default) |
 | \`stack-describe\` | title, description? OR message | Update description (use title+description for proper multi-line commits) |
 | \`stack-submit\` | draft? | Push + create/update PR |
@@ -194702,7 +194785,7 @@ Details: ${e2.message}`,
       });
     }
     return new PartialShipConfig({
-      // provider defaults to "linear" in schema
+      provider: yaml.provider ?? "linear",
       linear: yaml.linear ? some2(
         new LinearConfig({
           teamId: asTeamId(yaml.linear.teamId),
@@ -194710,8 +194793,13 @@ Details: ${e2.message}`,
           projectId: yaml.linear.projectId ? some2(asProjectId(yaml.linear.projectId)) : none2()
         })
       ) : none2(),
-      notion: none2(),
-      // TODO: Parse notion config from yaml when implemented
+      notion: yaml.notion ? some2(
+        new NotionConfig({
+          databaseId: yaml.notion.databaseId,
+          workspaceId: yaml.notion.workspaceId ? some2(yaml.notion.workspaceId) : none2(),
+          propertyMapping: new NotionPropertyMapping({})
+        })
+      ) : none2(),
       auth: yaml.auth ? some2(new AuthConfig({ apiKey: yaml.auth.apiKey })) : none2()
     });
   };
@@ -194752,17 +194840,37 @@ Details: ${e2.message}`,
   });
   const load = () => gen2(function* () {
     const yaml = yield* readYaml();
-    if (!yaml || !yaml.linear || !yaml.auth) {
+    if (!yaml || !yaml.auth) {
       return yield* fail7(WorkspaceNotInitializedError.default);
     }
+    const provider = yaml.provider ?? "linear";
+    if (provider === "linear" && !yaml.linear) {
+      return yield* fail7(WorkspaceNotInitializedError.default);
+    }
+    if (provider === "notion" && !yaml.notion) {
+      return yield* fail7(WorkspaceNotInitializedError.default);
+    }
+    const linearConfig = yaml.linear ? new LinearConfig({
+      teamId: asTeamId(yaml.linear.teamId),
+      teamKey: yaml.linear.teamKey,
+      projectId: yaml.linear.projectId ? some2(asProjectId(yaml.linear.projectId)) : none2()
+    }) : new LinearConfig({
+      teamId: asTeamId("notion-workspace"),
+      teamKey: "NOTION",
+      projectId: none2()
+    });
+    const notionConfig = yaml.notion ? some2(
+      new NotionConfig({
+        databaseId: yaml.notion.databaseId,
+        workspaceId: yaml.notion.workspaceId ? some2(yaml.notion.workspaceId) : none2(),
+        // Use defaults from NotionPropertyMapping, override with yaml values if present
+        propertyMapping: new NotionPropertyMapping({})
+      })
+    ) : none2();
     return new ShipConfig({
-      linear: new LinearConfig({
-        teamId: asTeamId(yaml.linear.teamId),
-        teamKey: yaml.linear.teamKey,
-        projectId: yaml.linear.projectId ? some2(asProjectId(yaml.linear.projectId)) : none2()
-      }),
-      notion: none2(),
-      // TODO: Parse notion config from yaml when implemented
+      provider,
+      linear: linearConfig,
+      notion: notionConfig,
       auth: new AuthConfig({ apiKey: yaml.auth.apiKey }),
       git: new GitConfig({ defaultBranch: yaml.git?.defaultBranch ?? "main" }),
       pr: new PrConfig({ openBrowser: yaml.pr?.openBrowser ?? true }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ship-cli/core",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "module",
   "license": "MIT",
   "description": "Linear + jj workflow CLI for AI agents",