fix(opencode): tighten retry and entrypoint guards

Author: Danigm-dev

apps/sim/app/api/tools/opencode/prompt/route.test.ts

@@ -294,6 +294,43 @@ describe('POST /api/tools/opencode/prompt', () => {
     })
   })
 
+  it('does not retry when a newly created session fails immediately', async () => {
+    mockPromptOpenCodeSession.mockRejectedValueOnce(new Error('session not found'))
+    mockShouldRetryWithFreshOpenCodeSession.mockReturnValue(true)
+    mockCreateOpenCodeSession.mockResolvedValue({ id: 'fresh-session' })
+
+    const request = createMockRequest('POST', {
+      repository: 'repo-a',
+      providerId: 'provider-a',
+      modelId: 'model-a',
+      prompt: 'retry please',
+      _context: {
+        workspaceId: 'ws-1',
+        workflowId: 'wf-1',
+        userId: 'user-123',
+      },
+    })
+
+    const response = await POST(request as never)
+    const data = await response.json()
+
+    expect(response.status).toBe(200)
+    expect(mockCreateOpenCodeSession).toHaveBeenCalledTimes(1)
+    expect(mockPromptOpenCodeSession).toHaveBeenCalledTimes(1)
+    expect(mockLogOpenCodeFailure).toHaveBeenCalledWith(
+      'Failed to execute OpenCode prompt',
+      expect.objectContaining({ message: 'session not found' })
+    )
+    expect(data).toEqual({
+      success: true,
+      output: {
+        content: '',
+        threadId: 'fresh-session',
+        error: 'session not found',
+      },
+    })
+  })
+
   it('stores and returns the fresh session id when the retry prompt fails', async () => {
     mockGetStoredOpenCodeSession.mockResolvedValue({
       sessionId: 'stale-session',

apps/sim/app/api/tools/opencode/prompt/route.ts

@@ -136,10 +136,9 @@ export async function POST(request: NextRequest) {
     const memoryKey = buildOpenCodeSessionMemoryKey(workflowId, sessionOwnerKey)
     const newThread = coerceOpenCodeBoolean(body.newThread)
     const storedThread = newThread ? null : await getStoredOpenCodeSession(workspaceId, memoryKey)
+    const reusedStoredThread = Boolean(storedThread && storedThread.repository === repositoryId)
     let threadId =
-      storedThread && storedThread.repository === repositoryId
-        ? storedThread.sessionId
-        : undefined
+      reusedStoredThread ? storedThread.sessionId : undefined
 
     if (!threadId) {
       const session = await createOpenCodeSession(
@@ -177,7 +176,7 @@ export async function POST(request: NextRequest) {
 
       return buildSuccessResponse(result.threadId, result.content, result.cost)
     } catch (error) {
-      if (threadId && !newThread && shouldRetryWithFreshOpenCodeSession(error)) {
+      if (reusedStoredThread && threadId && !newThread && shouldRetryWithFreshOpenCodeSession(error)) {
         let freshSessionId = threadId
 
         try {

apps/sim/lib/opencode/service.ts

@@ -220,7 +220,7 @@ function getAssistantErrorMessage(error: AssistantMessage['error']): string | un
   return error.name
 }
 
-export function extractOpenCodeText(parts: Part[]): string {
+function extractOpenCodeText(parts: Part[]): string {
   return parts
     .filter((part): part is Extract<Part, { type: 'text' }> => part.type === 'text')
     .map((part) => part.text.trim())

docker/opencode/entrypoint.sh

@@ -5,6 +5,15 @@ log() {
   printf '[opencode-entrypoint] %s\n' "$*"
 }
 
+validate_port() {
+  local port="$1"
+
+  if [[ ! "$port" =~ ^[0-9]+$ ]]; then
+    log "OPENCODE_PORT must be a numeric TCP port"
+    exit 1
+  fi
+}
+
 write_runtime_env() {
   local env_file="/home/opencode/.config/opencode/runtime-env.sh"
   local vars=(
@@ -88,6 +97,8 @@ main() {
     export GOOGLE_GENERATIVE_AI_API_KEY="${GEMINI_API_KEY}"
   fi
 
+  validate_port "${OPENCODE_PORT}"
+
   mkdir -p "${OPENCODE_REPOSITORY_ROOT}" /home/opencode/.config/opencode /home/opencode/.local/share/opencode /home/opencode/.local/state
   chown -R opencode:opencode "${OPENCODE_REPOSITORY_ROOT}" /home/opencode/.config /home/opencode/.local/share /home/opencode/.local/state