Skip to content

Copilot/resolve conflicts - #2

Merged
HusainMkd merged 6671 commits into
devfrom
copilot/resolve-conflicts
Jun 1, 2026
Merged

HusainMkd merged 6671 commits into
devfrom
copilot/resolve-conflicts

Conversation

@HusainMkd

Copy link
Copy Markdown
Owner

What does this PR do?

How did you verify your code works?

robposch and others added 30 commits May 25, 2026 16:29
…u can specify one without both being required (anomalyco#29268)

Co-authored-by: Robert Poschenrieder <Robert_Poschenrieder@epdeberw000f.fritz.box>
thdxr and others added 25 commits May 31, 2026 12:06
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
…30167)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Direct run mode previously made submitted follow-up prompts irrevocable while a response was still running. Let users edit or remove queued prompts before dispatch without interrupting the active turn.
…o#30145)

Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com>
…anomalyco#29710)

Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Simon Klee <hello@simonklee.dk>
@github-actions

github-actions Bot commented Jun 1, 2026

Copy link
Copy Markdown

Hey! Your PR title Copilot/resolve conflicts doesn't follow conventional commit format.

Please update it to start with one of:

  • feat: or feat(scope): new feature
  • fix: or fix(scope): bug fix
  • docs: or docs(scope): documentation changes
  • chore: or chore(scope): maintenance tasks
  • refactor: or refactor(scope): code refactoring
  • test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

@HusainMkd
HusainMkd merged commit 8572112 into dev Jun 1, 2026
1 of 9 checks passed
@HusainMkd
HusainMkd deleted the copilot/resolve-conflicts branch June 1, 2026 16:17

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces significant updates across the codebase, including transitioning the desktop application from Tauri to Electron, adding comprehensive localization glossaries, implementing an AWS S3 Tables-based data lake with Athena querying, and adding a SolidJS TUI smoke test plugin. Additionally, project configuration, CI/CD workflows, and app dialogs were refined, and a performance monitoring DebugBar was introduced. Key feedback from the review highlights reactivity issues in app.tsx where createResource needs a source function to track server changes, potential TypeErrors in dialog-select-directory.tsx from unsafe array indexing, and opportunities to improve header normalization and shell script path expansion robustness.

Comment thread packages/app/src/app.tsx
Comment on lines +196 to +213
const [startupHealthCheck, healthCheckActions] = createResource(() =>
props.disableHealthCheck
? true
: Effect.gen(function* () {
if (!server.current) return true
const { http, type } = server.current

while (true) {
const res = yield* Effect.promise(() => checkServerHealth(http))
if (res.healthy) return true
if (checkMode() === "background" || type === "http") return false
}
}).pipe(
Effect.timeoutOrElse({ duration: "10 seconds", orElse: () => Effect.succeed(false) }),
Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
Effect.runPromise,
),
)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In SolidJS, createResource only tracks reactive dependencies read inside its first argument (the source function). Since server.current is read inside the fetcher function (the single argument form of createResource), changes to server.current will not trigger a refetch when the user switches servers. Pass a source function as the first argument to correctly track these dependencies.

  const [startupHealthCheck, healthCheckActions] = createResource(
    () => ({
      disable: props.disableHealthCheck,
      current: server.current,
    }),
    ({ disable, current }) => {
      if (disable) return Promise.resolve(true)
      return Effect.gen(function* () {
        if (!current) return true
        const { http, type } = current

        while (true) {
          const res = yield* Effect.promise(() => checkServerHealth(http))
          if (res.healthy) return true
          if (checkMode() === "background" || type === "http") return false
        }
      }).pipe(
        Effect.timeoutOrElse({ duration: "10 seconds", orElse: () => Effect.succeed(false) }),
        Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
        Effect.runPromise,
      )
    }
  )

Comment on lines 4 to 12
const response = await fetch(`https://api.github.com${endpoint}`, {
...options,
headers: {
Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
Accept: "application/vnd.github+json",
"Content-Type": "application/json",
...options.headers,
...(options.headers instanceof Headers ? Object.fromEntries(options.headers.entries()) : options.headers),
},
})

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Instead of manually checking if options.headers is an instance of Headers and spreading it, you can use the standard Headers constructor. This automatically and robustly handles all valid HeadersInit types (including Headers, Record<string, string>, and [string, string][] arrays) without potential runtime errors or incorrect object spreading.

Suggested change
const response = await fetch(`https://api.github.com${endpoint}`, {
...options,
headers: {
Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
Accept: "application/vnd.github+json",
"Content-Type": "application/json",
...options.headers,
...(options.headers instanceof Headers ? Object.fromEntries(options.headers.entries()) : options.headers),
},
})
const headers = new Headers(options.headers)
headers.set("Authorization", `Bearer ${process.env.GITHUB_TOKEN}`)
headers.set("Accept", "application/vnd.github+json")
headers.set("Content-Type", "application/json")
const response = await fetch(`https://api.github.com${endpoint}`, {
...options,
headers,
})

Accept: "application/vnd.github+json",
"Content-Type": "application/json",
...options.headers,
...(options.headers instanceof Headers ? Object.fromEntries(options.headers.entries()) : options.headers),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To safely support all valid HeadersInit types (including [string, string][] arrays) without manual type checking or incorrect object spreading, use the standard Headers constructor to normalize the headers before converting them to an object.

Suggested change
...(options.headers instanceof Headers ? Object.fromEntries(options.headers.entries()) : options.headers),
...(options.headers ? Object.fromEntries(new Headers(options.headers).entries()) : {}),

Comment thread install
Comment on lines +386 to 389
config_files="${ZDOTDIR:-$HOME}/.zshrc ${ZDOTDIR:-$HOME}/.zshenv $XDG_CONFIG_HOME/zsh/.zshrc $XDG_CONFIG_HOME/zsh/.zshenv"
;;
bash)
config_files="$HOME/.bashrc $HOME/.bash_profile $HOME/.profile $XDG_CONFIG_HOME/bash/.bashrc $XDG_CONFIG_HOME/bash/.bash_profile"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

If XDG_CONFIG_HOME is unset or empty, $XDG_CONFIG_HOME/zsh/.zshrc and $XDG_CONFIG_HOME/bash/.bashrc will expand to /zsh/.zshrc and /bash/.zshrc respectively, which are invalid paths. Use parameter expansion with a fallback to $HOME/.config to handle this case safely.

        config_files="${ZDOTDIR:-$HOME}/.zshrc ${ZDOTDIR:-$HOME}/.zshenv ${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshrc ${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshenv"
    ;;
    bash)
        config_files="$HOME/.bashrc $HOME/.bash_profile $HOME/.profile ${XDG_CONFIG_HOME:-$HOME/.config}/bash/.bashrc ${XDG_CONFIG_HOME:-$HOME/.config}/bash/.bash_profile"

const dirs = [project.worktree, ...(project.sandboxes ?? [])]
for (const directory of dirs) {
const sessions = sync.child(directory, { bootstrap: false })[0].session
for (const session of sessions) {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

If sync.child(directory, { bootstrap: false }) returns undefined or an empty array, accessing [0] will throw a TypeError. Use optional chaining to safely access the session list.

        const child = sync.child(directory, { bootstrap: false })
        const sessions = child?.[0]?.session ?? []

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.