Skip to content

🤖 Add auto-rebase feature for workspaces #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+3,555 −449
Draft

🤖 Add auto-rebase feature for workspaces #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6435d9
🤖 Add auto-rebase feature for workspaces
ThomasK33 Oct 13, 2025
a2621b9
wip
ThomasK33 Oct 17, 2025
4395fd2
🤖 Fix rebase conflicts and type errors
ThomasK33 Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .claude/settings.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"permissions": {
"allow": [
"Bash(make typecheck:*)",
"Bash(make static-check:*)",
"Bash(git add:*)",
"Bash(git rebase:*)",
"Bash(bat:*)",
"Bash(bun test:*)",
"Bash(git mv:*)"
],
"deny": [],
"ask": []
}
}
202 changes: 202 additions & 0 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,208 @@ export default defineConfig([
message:
"Frontend code cannot import from utils/main/ (contains Node.js APIs). Move shared code to utils/ or use IPC.",
},
{
group: ["node:*"],
message:
"Frontend code cannot import Node.js built-in modules (node:* imports). These modules are only available in the main process. Use window.api IPC calls to access Node.js functionality.",
},
],
paths: [
{
name: "assert",
message:
"Frontend code cannot import Node.js 'assert' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "assert/strict",
message:
"Frontend code cannot import Node.js 'assert/strict' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "buffer",
message:
"Frontend code cannot import Node.js 'buffer' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "child_process",
message:
"Frontend code cannot import Node.js 'child_process' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "cluster",
message:
"Frontend code cannot import Node.js 'cluster' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "crypto",
message:
"Frontend code cannot import Node.js 'crypto' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "dgram",
message:
"Frontend code cannot import Node.js 'dgram' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "dns",
message:
"Frontend code cannot import Node.js 'dns' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "domain",
message:
"Frontend code cannot import Node.js 'domain' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "events",
message:
"Frontend code cannot import Node.js 'events' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "fs",
message:
"Frontend code cannot import Node.js 'fs' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "fs/promises",
message:
"Frontend code cannot import Node.js 'fs/promises' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "http",
message:
"Frontend code cannot import Node.js 'http' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "http2",
message:
"Frontend code cannot import Node.js 'http2' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "https",
message:
"Frontend code cannot import Node.js 'https' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "inspector",
message:
"Frontend code cannot import Node.js 'inspector' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "module",
message:
"Frontend code cannot import Node.js 'module' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "net",
message:
"Frontend code cannot import Node.js 'net' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "os",
message:
"Frontend code cannot import Node.js 'os' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "path",
message:
"Frontend code cannot import Node.js 'path' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "perf_hooks",
message:
"Frontend code cannot import Node.js 'perf_hooks' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "process",
message:
"Frontend code cannot import Node.js 'process' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "punycode",
message:
"Frontend code cannot import Node.js 'punycode' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "querystring",
message:
"Frontend code cannot import Node.js 'querystring' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "readline",
message:
"Frontend code cannot import Node.js 'readline' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "repl",
message:
"Frontend code cannot import Node.js 'repl' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "stream",
message:
"Frontend code cannot import Node.js 'stream' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "string_decoder",
message:
"Frontend code cannot import Node.js 'string_decoder' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "sys",
message:
"Frontend code cannot import Node.js 'sys' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "timers",
message:
"Frontend code cannot import Node.js 'timers' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "tls",
message:
"Frontend code cannot import Node.js 'tls' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "trace_events",
message:
"Frontend code cannot import Node.js 'trace_events' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "tty",
message:
"Frontend code cannot import Node.js 'tty' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "url",
message:
"Frontend code cannot import Node.js 'url' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "util",
message:
"Frontend code cannot import Node.js 'util' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "v8",
message:
"Frontend code cannot import Node.js 'v8' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "vm",
message:
"Frontend code cannot import Node.js 'vm' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "worker_threads",
message:
"Frontend code cannot import Node.js 'worker_threads' module. Use window.api IPC calls to access Node.js functionality.",
},
{
name: "zlib",
message:
"Frontend code cannot import Node.js 'zlib' module. Use window.api IPC calls to access Node.js functionality.",
},
],
},
],
Expand Down
3 changes: 3 additions & 0 deletions src/assets/icons/refresh.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/AIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ const AIViewInner: React.FC<AIViewProps> = ({
gitStatus={gitStatus}
workspaceId={workspaceId}
tooltipPosition="bottom"
isStreaming={canInterrupt}
/>
<RuntimeBadge runtimeConfig={runtimeConfig} />
<span className="min-w-0 truncate font-mono text-xs">
Expand Down
Loading
Loading