fix(builder): recover localnet publish ids

Recover the extension package ID from the ephemeral pubfile when test-publish JSON does not include a published package change.

Also seed a fresh Pub.extension.toml from the copied world pubfile so repeated localnet extension publishes remain idempotent.

Author: Scetrov

pkg/builder/builder_test.go

@@ -153,6 +153,63 @@ func TestExtractPublishIDs_CaseInsensitiveConfig(t *testing.T) {
 	assert.Equal(t, "0xLOWER", cfgID)
 }
 
+func TestGetLastPublishedAt(t *testing.T) {
+	pubfile := filepath.Join(t.TempDir(), "Pub.localnet.toml")
+	content := `# generated by Move
+build-env = "testnet"
+chain-id = "localnet"
+
+[[published]]
+source = { local = "/workspace/world-contracts/contracts/world" }
+published-at = "0xWORLD"
+original-id = "0xWORLD"
+version = 0
+
+[[published]]
+source = { local = "/workspace/builder-scaffold/move-contracts/smart_gate_extension" }
+published-at = "0xEXT"
+original-id = "0xEXT"
+version = 0
+`
+	require.NoError(t, os.WriteFile(pubfile, []byte(content), 0600))
+
+	pkgID, err := getLastPublishedAt(pubfile)
+	require.NoError(t, err)
+	assert.Equal(t, "0xEXT", pkgID)
+}
+
+func TestWritePublishedIDs_FallsBackToPubfile(t *testing.T) {
+	workspace := t.TempDir()
+	builderDir := filepath.Join(workspace, "builder-scaffold")
+	require.NoError(t, os.MkdirAll(filepath.Join(builderDir, "deployments", "localnet"), 0750))
+	require.NoError(t, os.WriteFile(filepath.Join(builderDir, ".env"), []byte("BUILDER_PACKAGE_ID=\nEXTENSION_CONFIG_ID=\n"), 0600))
+
+	pubfile := filepath.Join(builderDir, "deployments", "localnet", "Pub.localnet.toml")
+	require.NoError(t, os.WriteFile(pubfile, []byte(`build-env = "testnet"
+chain-id = "localnet"
+
+[[published]]
+source = { local = "/workspace/world-contracts/contracts/world" }
+published-at = "0xWORLD"
+original-id = "0xWORLD"
+version = 0
+
+[[published]]
+source = { local = "/workspace/builder-scaffold/move-contracts/smart_gate_extension" }
+published-at = "0xEXT"
+original-id = "0xEXT"
+version = 0
+`), 0600))
+
+	output := `{"objectChanges":[{"type":"created","objectType":"0x::builder::ExtensionConfig","objectId":"0xCFG"}]}`
+	require.NoError(t, writePublishedIDs(workspace, output, pubfile))
+
+	envData, err := os.ReadFile(filepath.Join(builderDir, ".env"))
+	require.NoError(t, err)
+	assert.Contains(t, string(envData), "BUILDER_PACKAGE_ID=0xEXT")
+	assert.Contains(t, string(envData), "EXTENSION_CONFIG_ID=0xCFG")
+}
+
 // ── buildPublishCmd ────────────────────────────────────────────────
 
 func TestBuildPublishCmd_Localnet(t *testing.T) {
@@ -163,11 +220,12 @@ func TestBuildPublishCmd_Localnet(t *testing.T) {
 	pubFile := filepath.Join(pubDir, "Pub.extension.toml")
 	require.NoError(t, os.WriteFile(pubFile, []byte("old"), 0600))
 
-	cmd, err := buildPublishCmd(nil, tmp, "localnet", "/workspace/contracts/my_ext")
+	cmd, pubfilePath, err := buildPublishCmd(nil, tmp, "localnet", "/workspace/contracts/my_ext")
 	require.NoError(t, err)
 	assert.Contains(t, cmd, "sui client test-publish")
 	assert.Contains(t, cmd, "--pubfile-path /workspace/builder-scaffold/deployments/localnet/Pub.extension.toml")
 	assert.Contains(t, cmd, "/workspace/contracts/my_ext")
+	assert.Equal(t, pubFile, pubfilePath)
 	// The stale file should have been removed
 	_, statErr := os.Stat(pubFile)
 	assert.True(t, os.IsNotExist(statErr))
@@ -177,24 +235,30 @@ func TestBuildPublishCmd_LocalnetWithExistingWorldPubfile(t *testing.T) {
 	tmp := t.TempDir()
 	pubDir := filepath.Join(tmp, "builder-scaffold", "deployments", "localnet")
 	require.NoError(t, os.MkdirAll(pubDir, 0750))
-	require.NoError(t, os.WriteFile(filepath.Join(pubDir, "Pub.localnet.toml"), []byte("world"), 0600))
+	worldPubfile := filepath.Join(pubDir, "Pub.localnet.toml")
+	require.NoError(t, os.WriteFile(worldPubfile, []byte("world"), 0600))
 
-	cmd, err := buildPublishCmd(nil, tmp, "localnet", "/workspace/contracts/my_ext")
+	cmd, pubfilePath, err := buildPublishCmd(nil, tmp, "localnet", "/workspace/contracts/my_ext")
 	require.NoError(t, err)
 	assert.Contains(t, cmd, "sui client test-publish")
-	assert.Contains(t, cmd, "--pubfile-path /workspace/builder-scaffold/deployments/localnet/Pub.localnet.toml")
+	assert.Contains(t, cmd, "--pubfile-path /workspace/builder-scaffold/deployments/localnet/Pub.extension.toml")
 	assert.NotContains(t, cmd, "sui client publish --pubfile-path")
+	assert.Equal(t, filepath.Join(pubDir, "Pub.extension.toml"), pubfilePath)
+	seededPubfile, readErr := os.ReadFile(pubfilePath)
+	require.NoError(t, readErr)
+	assert.Equal(t, "world", string(seededPubfile))
 }
 
 func TestBuildPublishCmd_Testnet(t *testing.T) {
-	cmd, err := buildPublishCmd(nil, "/ws", "testnet", "/workspace/contracts/ext")
+	cmd, pubfilePath, err := buildPublishCmd(nil, "/ws", "testnet", "/workspace/contracts/ext")
 	require.NoError(t, err)
 	assert.Contains(t, cmd, "sui client publish")
 	assert.Contains(t, cmd, "--json")
+	assert.Empty(t, pubfilePath)
 }
 
 func TestBuildPublishCmd_UnsupportedNetwork(t *testing.T) {
-	_, err := buildPublishCmd(nil, "/ws", "mainnet", "/dir")
+	_, _, err := buildPublishCmd(nil, "/ws", "mainnet", "/dir")
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "unsupported network")
 }

pkg/builder/publish.go

@@ -76,7 +76,7 @@ func PublishExtension(c container.ContainerClient, workspace string, network str
 
 	ui.Info.Printf("Executing publish inside container at %s...\n", candidate.ContainerPath)
 
-	publishCmd, err := buildPublishCmd(c, workspace, network, candidate.ContainerPath)
+	publishCmd, pubfilePath, err := buildPublishCmd(c, workspace, network, candidate.ContainerPath)
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func PublishExtension(c container.ContainerClient, workspace string, network str
 		return fmt.Errorf("publish command failed: %w", err)
 	}
 
-	return writePublishedIDs(workspace, output)
+	return writePublishedIDs(workspace, output, pubfilePath)
 }
 
 func resolvePublishContractDir(workspace string) (PublishCandidate, error) {
@@ -225,9 +225,9 @@ func isExtensionManifest(manifestPath string) (bool, error) {
 	return strings.Contains(string(manifestContent), worldDependencyMarker), nil
 }
 
-// buildPublishCmd constructs the sui publish command and, for localnet, uses
-// test-publish with pubfiles so that re-running is idempotent.
-func buildPublishCmd(c container.ContainerClient, workspace, network, containerContractDir string) (string, error) {
+// buildPublishCmd constructs the sui publish command and, for localnet, returns
+// the pubfile updated by test-publish so IDs can be recovered from it when needed.
+func buildPublishCmd(c container.ContainerClient, workspace, network, containerContractDir string) (string, string, error) {
 	switch network {
 	case "localnet":
 		// Check if we have an existing world publication file to use as a dependency.
@@ -256,40 +256,52 @@ func buildPublishCmd(c container.ContainerClient, workspace, network, containerC
 
 		if foundPub != "" {
 			ui.Info.Printf("Found existing world publication (%s); using it as a dependency.\n", foundPub)
+			pubFile := filepath.Join(workspace, "builder-scaffold", "deployments", network, "Pub.extension.toml")
+			if err := copyFile(foundPath, pubFile); err != nil {
+				return "", "", fmt.Errorf("failed to seed extension pubfile from %s: %w", foundPub, err)
+			}
 			return fmt.Sprintf(
-				"cd %s && sui client test-publish --pubfile-path /workspace/builder-scaffold/deployments/localnet/%s --build-env testnet --json",
-				containerContractDir, foundPub,
-			), nil
+				"cd %s && sui client test-publish --pubfile-path /workspace/builder-scaffold/deployments/localnet/Pub.extension.toml --build-env testnet --json",
+				containerContractDir,
+			), pubFile, nil
 		}
 
 		// Fallback to full publish if no existing world publication is found
 		pubFile := filepath.Join(workspace, "builder-scaffold", "deployments", network, "Pub.extension.toml")
 		if err := os.Remove(pubFile); err != nil && !os.IsNotExist(err) {
-			return "", fmt.Errorf("failed to remove previous publish file: %w", err)
+			return "", "", fmt.Errorf("failed to remove previous publish file: %w", err)
 		}
 		return fmt.Sprintf(
 			"cd %s && sui client test-publish --with-unpublished-dependencies --build-env testnet --pubfile-path /workspace/builder-scaffold/deployments/localnet/Pub.extension.toml --json",
 			containerContractDir,
-		), nil
+		), pubFile, nil
 
 	case "testnet":
 		return fmt.Sprintf(
 			"cd %s && sui client publish --with-unpublished-dependencies --build-env testnet --json",
 			containerContractDir,
-		), nil
+		), "", nil
 
 	default:
-		return "", fmt.Errorf("unsupported network %s", network)
+		return "", "", fmt.Errorf("unsupported network %s", network)
 	}
 }
 
 // writePublishedIDs parses the publish command JSON output and writes the discovered
 // package and config IDs into builder-scaffold/.env.
-func writePublishedIDs(workspace, output string) error {
+func writePublishedIDs(workspace, output, pubfilePath string) error {
 	builderPackageID, extensionConfigID, parseErr := extractPublishIDs(output)
 	if parseErr != nil {
 		ui.Warn.Printf("Could not parse publish output as JSON: %v\n", parseErr)
 	}
+	if builderPackageID == "" && pubfilePath != "" {
+		pubfilePackageID, err := getLastPublishedAt(pubfilePath)
+		if err != nil {
+			ui.Warn.Printf("Could not extract BUILDER_PACKAGE_ID from %s: %v\n", pubfilePath, err)
+		} else {
+			builderPackageID = pubfilePackageID
+		}
+	}
 
 	if builderPackageID == "" {
 		ui.Warn.Println("Could not automatically extract BUILDER_PACKAGE_ID. Please set it manually in builder-scaffold/.env")
@@ -520,3 +532,20 @@ func getPubfileChainID(pubfilePath string) (string, error) {
 	}
 	return "", fmt.Errorf("chain-id not found in %s", pubfilePath)
 }
+
+func getLastPublishedAt(pubfilePath string) (string, error) {
+	content, err := os.ReadFile(pubfilePath) // #nosec G304 -- path is constructed in caller from workspace-local paths
+	if err != nil {
+		return "", err
+	}
+	re := regexp.MustCompile(`published-at\s*=\s*"([^"]+)"`)
+	matches := re.FindAllStringSubmatch(string(content), -1)
+	if len(matches) == 0 {
+		return "", fmt.Errorf("published-at not found in %s", pubfilePath)
+	}
+	last := matches[len(matches)-1]
+	if len(last) < 2 || last[1] == "" {
+		return "", fmt.Errorf("published-at not found in %s", pubfilePath)
+	}
+	return last[1], nil
+}