anthropics/claude-code-action
1
0
Fork 0
mirror of https://github.com/anthropics/claude-code-action.git synced 2026-01-23 06:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Ashwin Bhat
2025-08-20 07:16:00 -07:00
parent 733e2f5302
commit 3fdfa8eea7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modes/remote-agent/index.ts
View File

@@ -3,12 +3,8 @@ import { mkdir, writeFile } from "fs/promises";
import type { Mode, ModeOptions, ModeResult } from "../types"; import type { Mode, ModeOptions, ModeResult } from "../types";
import { isRepositoryDispatchEvent } from "../../github/context"; import { isRepositoryDispatchEvent } from "../../github/context";
import type { GitHubContext } from "../../github/context"; import type { GitHubContext } from "../../github/context";
<<<<<<< HEAD
import { setupBranch } from "../../github/operations/branch";
=======
import { setupBranchWithResume } from "./branch"; import { setupBranchWithResume } from "./branch";
import { configureGitAuth } from "../../github/operations/git-config"; import { configureGitAuth } from "../../github/operations/git-config";
>>>>>>> 7d60d87 (feat: add resume endpoint support for remote-agent mode)
import { prepareMcpConfig } from "../../mcp/install-mcp-server"; import { prepareMcpConfig } from "../../mcp/install-mcp-server";
import { GITHUB_SERVER_URL } from "../../github/api/config"; import { GITHUB_SERVER_URL } from "../../github/api/config";
import { import {
@@ -229,7 +225,7 @@ export const remoteAgentMode: Mode = {
// Remote agent mode always uses commit signing for security // Remote agent mode always uses commit signing for security
// No git authentication configuration needed as we use GitHub API // No git authentication configuration needed as we use GitHub API
// Handle resume messages if they exist // Handle resume messages if they exist
if (branchInfo.resumeMessages && branchInfo.resumeMessages.length > 0) { if (branchInfo.resumeMessages && branchInfo.resumeMessages.length > 0) {
console.log( console.log(
@@ -237,10 +233,12 @@ export const remoteAgentMode: Mode = {
); );
// Store resume messages for later use // Store resume messages for later use
// These will be prepended to the conversation when Claude starts // These will be prepended to the conversation when Claude starts
core.setOutput("resume_messages", JSON.stringify(branchInfo.resumeMessages)); core.setOutput(
"resume_messages",
JSON.stringify(branchInfo.resumeMessages),
);
} }
// Report workflow initialized // Report workflow initialized
if (systemProgressConfig) { if (systemProgressConfig) {
reportWorkflowInitialized( reportWorkflowInitialized(