Skip to content

Commit 5cb5555

Browse files
authored
Merge branch 'main' into leoortizz_nextjsproxyfixes
2 parents 6afc826 + 567b537 commit 5cb5555

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed

.github/workflows/jules_bot_action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
JULES_KEY: ${{ secrets.JULES_KEY }}
3030
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3131
GOOGLE_API_KEY: ${{ secrets.GEMINI_API_KEY }}
32+
ISSUE_TITLE: ${{ github.event.issue.title }}
33+
ISSUE_NUMBER: ${{ github.event.issue.number }}
34+
ISSUE_BODY: ${{ github.event.issue.body }}
35+
ISSUE_URL: ${{ github.event.issue.html_url }}
3236
run: |
33-
printf -v PROMPT "%q\n" "Triage this new issue: ${{ github.event.issue.title }} ${{ github.event.issue.number }} ${{ github.event.issue.body }} ${{ github.event.issue.html_url }}"
34-
python julesbot/issues_call.py --prompt "$PROMPT"
37+
python julesbot/issues_call.py --prompt "Triage this new issue: $ISSUE_TITLE $ISSUE_NUMBER $ISSUE_BODY $ISSUE_URL"

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
- Update Data Connect Emulator to 3.0.1, which addresses some internal errors (#9627)
21
- Fix proxy.js/proxy.ts in Next.js 16 (#9631)

julesbot/issue_to_jules_agent/agent.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def jules_create_session(prompt: str, title: str) -> dict:
7272
"source": "sources/github/firebase/firebase-tools",
7373
"githubRepoContext": {"startingBranch": "main"},
7474
},
75+
"requirePlanApproval": False,
76+
"automationMode": "AUTO_CREATE_PR",
7577
"title": title,
7678
}
7779

@@ -115,25 +117,23 @@ def jules_create_session(prompt: str, title: str) -> dict:
115117
5. **Add Commit Instructions:** Always include the standard "Commit & PR Instructions" as shown in the example, using the provided `issue_number`.
116118
117119
### Input Placeholders
118-
- `{{issue_body}}`: The raw text of the issue report.
119-
- `{{discussion_body}}`: (Optional) The raw text of the discussion.
120-
- `{{original_link}}`: The URL to the original issue.
121-
- `{{issue_number}}`: The numerical ID of the issue.
122-
- `{{reproduction_steps}}`: (Optional) Pre-written steps to reproduce the issue.
120+
- `<issue_body>`: The raw text of the issue report.
121+
- `<discussion_body>`: (Optional) The raw text of the discussion.
122+
- `<original_link>`: The URL to the original issue.
123+
- `<issue_number>`: The numerical ID of the issue.
124+
- `<reproduction_steps>`: (Optional) Pre-written steps to reproduce the issue.
123125
124126
### Output Template & Example
125127
126128
---
127129
128130
#### Example Input:
129131
```json
130-
{
131132
"issue_body": "The login button looks weird on my phone. It's all the way on the right and hard to click. I'm using Safari.",
132133
"discussion_body": "User @dev1 confirmed this on iOS 15. It looks like a flexbox alignment problem in `container.css`. Should be a quick fix.",
133134
"original_link": "https://github.com/example/project/issues/123",
134135
"issue_number": "123",
135136
"reproduction_steps": ""
136-
}
137137
```
138138
139139
#### Corresponding Desired Output:
@@ -170,10 +170,11 @@ def jules_create_session(prompt: str, title: str) -> dict:
170170
Your job is to triage a GitHub issue. The tasks you should perform are:
171171
1. Determine if an issue is spam using the is_spam agent. If it is spam, use the issue_write tool to update the issue state to "closed" and then you are done.
172172
2. If it is not spam, hand off the issue to the LABELER tool (labeler_agent). When the LABELER tool is done, use the issue_write tool to update the issue with the suggested labels and add a label called 'Triaged by JulesBot'.
173-
3. Use the issue_type_agent to determine the type of issue. If it is a support request or feature request, report back and you are done.
173+
3. Use the issue_type_agent to determine the type of issue.
174174
4. If you have not done so yet, use the issue_read tool to get the comments on the issue, to help inform the next steps
175-
5. If it is a bug, use the complexity_scoping_agent to determine the complexity of the issue.
176-
6. If it is a bug with complexity of less than 30, use the jules_agent to submit it to Jules.
175+
5. If it is a support request, write up a reply. Maintain a helpful tone and try to debug the issue for the user. **DO NOT** actually send this reply, just report it back and you are done.
176+
6. If it is a feature request or bug, use the complexity_scoping_agent to determine the complexity of the issue.
177+
7. If it has a complexity of less than 40, use the jules_agent to submit it to Jules, and then you are done. If it has a complexity of 40 or more, report back the reasoning for the complexity score and you are done.
177178
""",
178179
tools=[github_toolset, IS_SPAM, ISSUE_TYPE, COMPLEXITY_SCORE, LABELER],
179180
sub_agents=[jules_agent],

npm-shrinkwrap.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-tools",
3-
"version": "15.0.0",
3+
"version": "15.1.0",
44
"description": "Command-Line Interface for Firebase",
55
"main": "./lib/index.js",
66
"mcpName": "io.github.firebase/firebase-mcp",

src/gcp/cloudsql/cloudsqladmin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export function instanceConsoleLink(projectId: string, instanceId: string) {
6161
}
6262

6363
export type DataConnectLabel = "ft" | "nt";
64-
export const DEFAULT_DATABASE_VERSION = "POSTGRES_15";
64+
export const DEFAULT_DATABASE_VERSION = "POSTGRES_17";
6565

6666
export async function createInstance(args: {
6767
projectId: string;

src/throttler/throttler.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ const throttlerTest = (ThrottlerConstructor: ThrottlerConstructorType): void =>
287287
expect(err.message).to.equal("Task index 0 failed: timed out after 100ms.");
288288
});
289289

290-
it("should reject with RetriesExhaustedError if last trial is rejected before timeout", async () => {
290+
it.skip("should reject with RetriesExhaustedError if last trial is rejected before timeout", async () => {
291291
const handler = sinon.stub().rejects(TEST_ERROR);
292292

293293
const q = new Queue({
@@ -336,7 +336,6 @@ const throttlerTest = (ThrottlerConstructor: ThrottlerConstructorType): void =>
336336
expect(q.complete).to.equal(1);
337337
expect(q.success).to.equal(0);
338338
expect(q.errored).to.equal(1);
339-
expect(q.retried).to.be.at.least(2);
340339
expect(q.total).to.equal(1);
341340
});
342341

0 commit comments

Comments
 (0)