@qelos/aidev 0.1.12 → 0.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/aidev.log +290 -0
- package/dist/__tests__/git.test.js +276 -0
- package/dist/__tests__/git.test.js.map +1 -1
- package/dist/commands/run.js +4 -4
- package/dist/commands/run.js.map +1 -1
- package/dist/git.d.ts +4 -2
- package/dist/git.d.ts.map +1 -1
- package/dist/git.js +51 -4
- package/dist/git.js.map +1 -1
- package/package.json +1 -1
package/aidev.log
CHANGED
|
@@ -1073,3 +1073,293 @@ error: please commit or stash them.
|
|
|
1073
1073
|
2026-03-07T20:30:29.135Z [success] Task implemented: branch 86c8nw4vy/support-tag-of-thinking-tasks pushed
|
|
1074
1074
|
2026-03-07T20:30:29.136Z [success] Done. Processed: 1, Skipped: 0
|
|
1075
1075
|
2026-03-07T20:37:33.334Z [info] Scheduled aidev jobs:
|
|
1076
|
+
|
|
1077
|
+
────────────────────────────────────────────────────────────
|
|
1078
|
+
2026-03-07T20:45:02.014Z [run] started
|
|
1079
|
+
────────────────────────────────────────────────────────────
|
|
1080
|
+
2026-03-07T20:45:02.117Z [info] Fetching tasks (filter: all)...
|
|
1081
|
+
2026-03-07T20:45:02.795Z [info] Found 1 tagged task(s)
|
|
1082
|
+
2026-03-07T20:45:02.796Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: open)
|
|
1083
|
+
2026-03-07T20:45:04.604Z [info] Running Cursor Agent...
|
|
1084
|
+
2026-03-07T20:45:06.343Z [warn] Cursor Agent exited with status 1
|
|
1085
|
+
2026-03-07T20:45:06.344Z [warn] Clarification check failed — proceeding without clarification
|
|
1086
|
+
2026-03-07T20:45:06.345Z [info] Implementing task: bugfix: sometimes you push to the wrong branch
|
|
1087
|
+
2026-03-07T20:45:11.974Z [info] Running cursor...
|
|
1088
|
+
2026-03-07T20:45:11.974Z [info] Running Cursor Agent...
|
|
1089
|
+
2026-03-07T20:45:13.711Z [warn] Cursor Agent exited with status 1
|
|
1090
|
+
2026-03-07T20:45:13.712Z [warn] cursor failed — trying next runner
|
|
1091
|
+
2026-03-07T20:45:13.713Z [info] Running claude...
|
|
1092
|
+
2026-03-07T20:45:13.713Z [info] Running Claude CLI...
|
|
1093
|
+
2026-03-07T20:45:14.989Z [warn] Claude exited with status 1
|
|
1094
|
+
2026-03-07T20:45:14.990Z [warn] claude failed — trying next runner
|
|
1095
|
+
2026-03-07T20:45:14.990Z [error] All AI runners failed or produced no changes
|
|
1096
|
+
2026-03-07T20:45:15.356Z [success] Done. Processed: 1, Skipped: 0
|
|
1097
|
+
|
|
1098
|
+
────────────────────────────────────────────────────────────
|
|
1099
|
+
2026-03-07T21:00:02.887Z [run] started
|
|
1100
|
+
────────────────────────────────────────────────────────────
|
|
1101
|
+
2026-03-07T21:00:02.987Z [info] Fetching tasks (filter: all)...
|
|
1102
|
+
2026-03-07T21:00:03.489Z [info] Found 1 tagged task(s)
|
|
1103
|
+
2026-03-07T21:00:03.490Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: open)
|
|
1104
|
+
2026-03-07T21:00:05.239Z [info] Running Cursor Agent...
|
|
1105
|
+
2026-03-07T21:00:06.948Z [warn] Cursor Agent exited with status 1
|
|
1106
|
+
2026-03-07T21:00:06.948Z [warn] Clarification check failed — proceeding without clarification
|
|
1107
|
+
2026-03-07T21:00:06.949Z [info] Implementing task: bugfix: sometimes you push to the wrong branch
|
|
1108
|
+
2026-03-07T21:00:12.219Z [info] Running cursor...
|
|
1109
|
+
2026-03-07T21:00:12.220Z [info] Running Cursor Agent...
|
|
1110
|
+
2026-03-07T21:00:13.926Z [warn] Cursor Agent exited with status 1
|
|
1111
|
+
2026-03-07T21:00:13.927Z [warn] cursor failed — trying next runner
|
|
1112
|
+
2026-03-07T21:00:13.927Z [info] Running claude...
|
|
1113
|
+
2026-03-07T21:00:13.928Z [info] Running Claude CLI...
|
|
1114
|
+
2026-03-07T21:00:14.900Z [warn] Claude exited with status 1
|
|
1115
|
+
2026-03-07T21:00:14.901Z [warn] claude failed — trying next runner
|
|
1116
|
+
2026-03-07T21:00:14.901Z [error] All AI runners failed or produced no changes
|
|
1117
|
+
2026-03-07T21:00:15.389Z [success] Done. Processed: 1, Skipped: 0
|
|
1118
|
+
|
|
1119
|
+
────────────────────────────────────────────────────────────
|
|
1120
|
+
2026-03-07T21:15:02.273Z [run] started
|
|
1121
|
+
────────────────────────────────────────────────────────────
|
|
1122
|
+
2026-03-07T21:15:02.363Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1123
|
+
2026-03-07T21:15:02.364Z [info] Fetching tasks (filter: all)...
|
|
1124
|
+
2026-03-07T21:15:02.987Z [info] Found 1 tagged task(s)
|
|
1125
|
+
2026-03-07T21:15:02.988Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: in progress)
|
|
1126
|
+
2026-03-07T21:15:05.518Z [info] [86c8p2x53] Posted sleep notification
|
|
1127
|
+
2026-03-07T21:15:05.519Z [success] Done. Processed: 0, Skipped: 1
|
|
1128
|
+
|
|
1129
|
+
────────────────────────────────────────────────────────────
|
|
1130
|
+
2026-03-07T21:30:01.806Z [run] started
|
|
1131
|
+
────────────────────────────────────────────────────────────
|
|
1132
|
+
2026-03-07T21:30:01.910Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1133
|
+
2026-03-07T21:30:01.911Z [info] Fetching tasks (filter: all)...
|
|
1134
|
+
2026-03-07T21:30:02.768Z [info] Found 1 tagged task(s)
|
|
1135
|
+
2026-03-07T21:30:02.768Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: in progress)
|
|
1136
|
+
2026-03-07T21:30:04.739Z [success] Done. Processed: 0, Skipped: 1
|
|
1137
|
+
|
|
1138
|
+
────────────────────────────────────────────────────────────
|
|
1139
|
+
2026-03-07T21:45:01.923Z [run] started
|
|
1140
|
+
────────────────────────────────────────────────────────────
|
|
1141
|
+
2026-03-07T21:45:02.014Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1142
|
+
2026-03-07T21:45:02.015Z [info] Fetching tasks (filter: all)...
|
|
1143
|
+
2026-03-07T21:45:02.678Z [info] Found 1 tagged task(s)
|
|
1144
|
+
2026-03-07T21:45:02.679Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: in progress)
|
|
1145
|
+
2026-03-07T21:45:04.734Z [success] Done. Processed: 0, Skipped: 1
|
|
1146
|
+
|
|
1147
|
+
────────────────────────────────────────────────────────────
|
|
1148
|
+
2026-03-07T21:59:11.895Z [run] started
|
|
1149
|
+
────────────────────────────────────────────────────────────
|
|
1150
|
+
2026-03-07T21:59:11.933Z [info] Fetching tasks (filter: all)...
|
|
1151
|
+
2026-03-07T21:59:12.508Z [info] Found 1 tagged task(s)
|
|
1152
|
+
2026-03-07T21:59:12.509Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: in progress)
|
|
1153
|
+
2026-03-07T21:59:14.235Z [info] Running Cursor Agent...
|
|
1154
|
+
2026-03-07T21:59:22.944Z [info] Implementing task: bugfix: sometimes you push to the wrong branch
|
|
1155
|
+
2026-03-07T21:59:28.221Z [info] Running cursor...
|
|
1156
|
+
2026-03-07T21:59:28.222Z [info] Running Cursor Agent...
|
|
1157
|
+
|
|
1158
|
+
────────────────────────────────────────────────────────────
|
|
1159
|
+
2026-03-07T22:00:02.330Z [run] started
|
|
1160
|
+
────────────────────────────────────────────────────────────
|
|
1161
|
+
2026-03-07T22:00:02.427Z [info] Fetching tasks (filter: all)...
|
|
1162
|
+
2026-03-07T22:00:02.797Z [info] Found 1 tagged task(s)
|
|
1163
|
+
2026-03-07T22:00:02.798Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: in progress)
|
|
1164
|
+
2026-03-07T22:00:04.510Z [info] Running Cursor Agent...
|
|
1165
|
+
2026-03-07T22:00:06.228Z [warn] Cursor Agent exited with status 1
|
|
1166
|
+
2026-03-07T22:00:06.229Z [warn] Clarification check failed — proceeding without clarification
|
|
1167
|
+
2026-03-07T22:00:06.230Z [info] Implementing task: bugfix: sometimes you push to the wrong branch
|
|
1168
|
+
2026-03-07T22:00:11.303Z [error] git checkout -b 86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch failed: fatal: a branch named '86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch' already exists
|
|
1169
|
+
|
|
1170
|
+
2026-03-07T22:00:11.304Z [error] Failed to create branch 86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch
|
|
1171
|
+
2026-03-07T22:00:11.304Z [success] Done. Processed: 1, Skipped: 0
|
|
1172
|
+
2026-03-07T22:04:12.829Z [error] Cannot create branch "task123/fix-bug": expected to be on "main" but currently on "some-other-branch"
|
|
1173
|
+
2026-03-07T22:04:12.973Z [error] Refusing to commit: expected branch "task123/fix-bug" but currently on "wrong-branch"
|
|
1174
|
+
2026-03-07T22:04:13.011Z [error] Refusing to commit directly to protected branch "main"
|
|
1175
|
+
2026-03-07T22:04:13.131Z [error] Refusing to push directly to protected branch "main"
|
|
1176
|
+
2026-03-07T22:04:13.219Z [error] Refusing to push: current branch "task123/fix-bug" does not match target branch "task456/other-task"
|
|
1177
|
+
2026-03-07T22:04:14.113Z [error] git pull failed: From /var/folders/88/xzz9sxx15s13cmqq5_1k0t480000gn/T/aidev-bare-QPvh2q
|
|
1178
|
+
* branch main -> FETCH_HEAD
|
|
1179
|
+
hint: You have divergent branches and need to specify how to reconcile them.
|
|
1180
|
+
hint: You can do so by running one of the following commands sometime before
|
|
1181
|
+
hint: your next pull:
|
|
1182
|
+
hint:
|
|
1183
|
+
hint: git config pull.rebase false # merge
|
|
1184
|
+
hint: git config pull.rebase true # rebase
|
|
1185
|
+
hint: git config pull.ff only # fast-forward only
|
|
1186
|
+
hint:
|
|
1187
|
+
hint: You can replace "git config" with "git config --global" to set a default
|
|
1188
|
+
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
|
|
1189
|
+
hint: or --ff-only on the command line to override the configured default per
|
|
1190
|
+
hint: invocation.
|
|
1191
|
+
fatal: Need to specify how to reconcile divergent branches.
|
|
1192
|
+
|
|
1193
|
+
2026-03-07T22:04:42.379Z [success] Task implemented: branch 86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch pushed
|
|
1194
|
+
2026-03-07T22:04:42.380Z [success] Done. Processed: 1, Skipped: 0
|
|
1195
|
+
|
|
1196
|
+
────────────────────────────────────────────────────────────
|
|
1197
|
+
2026-03-08T00:00:55.116Z [run] started
|
|
1198
|
+
────────────────────────────────────────────────────────────
|
|
1199
|
+
2026-03-08T00:00:55.211Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1200
|
+
2026-03-08T00:00:55.211Z [info] Fetching tasks (filter: all)...
|
|
1201
|
+
2026-03-08T00:00:55.572Z [info] Found 1 tagged task(s)
|
|
1202
|
+
2026-03-08T00:00:55.572Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1203
|
+
2026-03-08T00:00:57.632Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1204
|
+
2026-03-08T00:00:57.633Z [success] Done. Processed: 0, Skipped: 1
|
|
1205
|
+
|
|
1206
|
+
────────────────────────────────────────────────────────────
|
|
1207
|
+
2026-03-08T00:20:33.489Z [run] started
|
|
1208
|
+
────────────────────────────────────────────────────────────
|
|
1209
|
+
2026-03-08T00:20:33.590Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1210
|
+
2026-03-08T00:20:33.591Z [info] Fetching tasks (filter: all)...
|
|
1211
|
+
2026-03-08T00:20:34.145Z [info] Found 1 tagged task(s)
|
|
1212
|
+
2026-03-08T00:20:34.145Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1213
|
+
2026-03-08T00:20:36.082Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1214
|
+
2026-03-08T00:20:36.083Z [success] Done. Processed: 0, Skipped: 1
|
|
1215
|
+
|
|
1216
|
+
────────────────────────────────────────────────────────────
|
|
1217
|
+
2026-03-08T00:30:52.474Z [run] started
|
|
1218
|
+
────────────────────────────────────────────────────────────
|
|
1219
|
+
2026-03-08T00:30:52.576Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1220
|
+
2026-03-08T00:30:52.577Z [info] Fetching tasks (filter: all)...
|
|
1221
|
+
2026-03-08T00:30:53.065Z [info] Found 1 tagged task(s)
|
|
1222
|
+
2026-03-08T00:30:53.066Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1223
|
+
2026-03-08T00:30:55.275Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1224
|
+
2026-03-08T00:30:55.276Z [success] Done. Processed: 0, Skipped: 1
|
|
1225
|
+
|
|
1226
|
+
────────────────────────────────────────────────────────────
|
|
1227
|
+
2026-03-08T02:45:02.429Z [run] started
|
|
1228
|
+
────────────────────────────────────────────────────────────
|
|
1229
|
+
2026-03-08T02:45:02.535Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1230
|
+
2026-03-08T02:45:02.536Z [info] Fetching tasks (filter: all)...
|
|
1231
|
+
2026-03-08T02:45:03.172Z [info] Found 1 tagged task(s)
|
|
1232
|
+
2026-03-08T02:45:03.173Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1233
|
+
2026-03-08T02:45:05.195Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1234
|
+
2026-03-08T02:45:05.196Z [success] Done. Processed: 0, Skipped: 1
|
|
1235
|
+
|
|
1236
|
+
────────────────────────────────────────────────────────────
|
|
1237
|
+
2026-03-08T03:00:02.956Z [run] started
|
|
1238
|
+
────────────────────────────────────────────────────────────
|
|
1239
|
+
2026-03-08T03:00:03.052Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1240
|
+
2026-03-08T03:00:03.053Z [info] Fetching tasks (filter: all)...
|
|
1241
|
+
2026-03-08T03:00:03.478Z [info] Found 1 tagged task(s)
|
|
1242
|
+
2026-03-08T03:00:03.478Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1243
|
+
2026-03-08T03:00:05.490Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1244
|
+
2026-03-08T03:00:05.491Z [success] Done. Processed: 0, Skipped: 1
|
|
1245
|
+
|
|
1246
|
+
────────────────────────────────────────────────────────────
|
|
1247
|
+
2026-03-08T03:15:01.752Z [run] started
|
|
1248
|
+
────────────────────────────────────────────────────────────
|
|
1249
|
+
2026-03-08T03:15:01.850Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1250
|
+
2026-03-08T03:15:01.851Z [info] Fetching tasks (filter: all)...
|
|
1251
|
+
2026-03-08T03:15:02.340Z [info] Found 1 tagged task(s)
|
|
1252
|
+
2026-03-08T03:15:02.341Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1253
|
+
2026-03-08T03:15:04.371Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1254
|
+
2026-03-08T03:15:04.371Z [success] Done. Processed: 0, Skipped: 1
|
|
1255
|
+
|
|
1256
|
+
────────────────────────────────────────────────────────────
|
|
1257
|
+
2026-03-08T03:30:02.004Z [run] started
|
|
1258
|
+
────────────────────────────────────────────────────────────
|
|
1259
|
+
2026-03-08T03:30:02.104Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1260
|
+
2026-03-08T03:30:02.105Z [info] Fetching tasks (filter: all)...
|
|
1261
|
+
2026-03-08T03:30:02.571Z [info] Found 1 tagged task(s)
|
|
1262
|
+
2026-03-08T03:30:02.572Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1263
|
+
2026-03-08T03:30:04.612Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1264
|
+
2026-03-08T03:30:04.612Z [success] Done. Processed: 0, Skipped: 1
|
|
1265
|
+
|
|
1266
|
+
────────────────────────────────────────────────────────────
|
|
1267
|
+
2026-03-08T03:45:02.313Z [run] started
|
|
1268
|
+
────────────────────────────────────────────────────────────
|
|
1269
|
+
2026-03-08T03:45:02.414Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1270
|
+
2026-03-08T03:45:02.414Z [info] Fetching tasks (filter: all)...
|
|
1271
|
+
2026-03-08T03:45:03.006Z [info] Found 1 tagged task(s)
|
|
1272
|
+
2026-03-08T03:45:03.007Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1273
|
+
2026-03-08T03:45:04.997Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1274
|
+
2026-03-08T03:45:04.997Z [success] Done. Processed: 0, Skipped: 1
|
|
1275
|
+
|
|
1276
|
+
────────────────────────────────────────────────────────────
|
|
1277
|
+
2026-03-08T04:00:02.581Z [run] started
|
|
1278
|
+
────────────────────────────────────────────────────────────
|
|
1279
|
+
2026-03-08T04:00:02.681Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1280
|
+
2026-03-08T04:00:02.682Z [info] Fetching tasks (filter: all)...
|
|
1281
|
+
2026-03-08T04:00:03.311Z [info] Found 1 tagged task(s)
|
|
1282
|
+
2026-03-08T04:00:03.312Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1283
|
+
2026-03-08T04:00:05.387Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1284
|
+
2026-03-08T04:00:05.388Z [success] Done. Processed: 0, Skipped: 1
|
|
1285
|
+
|
|
1286
|
+
────────────────────────────────────────────────────────────
|
|
1287
|
+
2026-03-08T04:15:02.341Z [run] started
|
|
1288
|
+
────────────────────────────────────────────────────────────
|
|
1289
|
+
2026-03-08T04:15:02.438Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1290
|
+
2026-03-08T04:15:02.439Z [info] Fetching tasks (filter: all)...
|
|
1291
|
+
2026-03-08T04:15:02.950Z [info] Found 1 tagged task(s)
|
|
1292
|
+
2026-03-08T04:15:02.951Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1293
|
+
2026-03-08T04:15:05.346Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1294
|
+
2026-03-08T04:15:05.346Z [success] Done. Processed: 0, Skipped: 1
|
|
1295
|
+
|
|
1296
|
+
────────────────────────────────────────────────────────────
|
|
1297
|
+
2026-03-08T04:30:01.620Z [run] started
|
|
1298
|
+
────────────────────────────────────────────────────────────
|
|
1299
|
+
2026-03-08T04:30:01.723Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1300
|
+
2026-03-08T04:30:01.723Z [info] Fetching tasks (filter: all)...
|
|
1301
|
+
2026-03-08T04:30:02.228Z [info] Found 1 tagged task(s)
|
|
1302
|
+
2026-03-08T04:30:02.229Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1303
|
+
2026-03-08T04:30:04.232Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1304
|
+
2026-03-08T04:30:04.233Z [success] Done. Processed: 0, Skipped: 1
|
|
1305
|
+
|
|
1306
|
+
────────────────────────────────────────────────────────────
|
|
1307
|
+
2026-03-08T04:45:02.253Z [run] started
|
|
1308
|
+
────────────────────────────────────────────────────────────
|
|
1309
|
+
2026-03-08T04:45:02.354Z [warn] Screen is locked or display is asleep — AI agents cannot operate
|
|
1310
|
+
2026-03-08T04:45:02.354Z [info] Fetching tasks (filter: all)...
|
|
1311
|
+
2026-03-08T04:45:02.916Z [info] Found 1 tagged task(s)
|
|
1312
|
+
2026-03-08T04:45:02.917Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1313
|
+
2026-03-08T04:45:05.051Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1314
|
+
2026-03-08T04:45:05.052Z [success] Done. Processed: 0, Skipped: 1
|
|
1315
|
+
2026-03-08T05:08:12.981Z [error] Cannot create branch "task123/fix-bug": expected to be on "main" but currently on "some-other-branch"
|
|
1316
|
+
2026-03-08T05:08:13.124Z [error] Refusing to commit: expected branch "task123/fix-bug" but currently on "wrong-branch"
|
|
1317
|
+
2026-03-08T05:08:13.165Z [error] Refusing to commit directly to protected branch "main"
|
|
1318
|
+
2026-03-08T05:08:13.287Z [error] Refusing to push directly to protected branch "main"
|
|
1319
|
+
2026-03-08T05:08:13.370Z [error] Refusing to push: current branch "task123/fix-bug" does not match target branch "task456/other-task"
|
|
1320
|
+
2026-03-08T05:08:14.267Z [error] git pull failed: From /var/folders/88/xzz9sxx15s13cmqq5_1k0t480000gn/T/aidev-bare-21f4BS
|
|
1321
|
+
* branch main -> FETCH_HEAD
|
|
1322
|
+
hint: You have divergent branches and need to specify how to reconcile them.
|
|
1323
|
+
hint: You can do so by running one of the following commands sometime before
|
|
1324
|
+
hint: your next pull:
|
|
1325
|
+
hint:
|
|
1326
|
+
hint: git config pull.rebase false # merge
|
|
1327
|
+
hint: git config pull.rebase true # rebase
|
|
1328
|
+
hint: git config pull.ff only # fast-forward only
|
|
1329
|
+
hint:
|
|
1330
|
+
hint: You can replace "git config" with "git config --global" to set a default
|
|
1331
|
+
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
|
|
1332
|
+
hint: or --ff-only on the command line to override the configured default per
|
|
1333
|
+
hint: invocation.
|
|
1334
|
+
fatal: Need to specify how to reconcile divergent branches.
|
|
1335
|
+
|
|
1336
|
+
2026-03-08T05:08:47.467Z [error] Cannot create branch "task123/fix-bug": expected to be on "main" but currently on "some-other-branch"
|
|
1337
|
+
2026-03-08T05:08:47.609Z [error] Refusing to commit: expected branch "task123/fix-bug" but currently on "wrong-branch"
|
|
1338
|
+
2026-03-08T05:08:47.649Z [error] Refusing to commit directly to protected branch "main"
|
|
1339
|
+
2026-03-08T05:08:47.769Z [error] Refusing to push directly to protected branch "main"
|
|
1340
|
+
2026-03-08T05:08:47.851Z [error] Refusing to push: current branch "task123/fix-bug" does not match target branch "task456/other-task"
|
|
1341
|
+
2026-03-08T05:08:48.742Z [error] git pull failed: From /var/folders/88/xzz9sxx15s13cmqq5_1k0t480000gn/T/aidev-bare-KOeEbi
|
|
1342
|
+
* branch main -> FETCH_HEAD
|
|
1343
|
+
hint: You have divergent branches and need to specify how to reconcile them.
|
|
1344
|
+
hint: You can do so by running one of the following commands sometime before
|
|
1345
|
+
hint: your next pull:
|
|
1346
|
+
hint:
|
|
1347
|
+
hint: git config pull.rebase false # merge
|
|
1348
|
+
hint: git config pull.rebase true # rebase
|
|
1349
|
+
hint: git config pull.ff only # fast-forward only
|
|
1350
|
+
hint:
|
|
1351
|
+
hint: You can replace "git config" with "git config --global" to set a default
|
|
1352
|
+
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
|
|
1353
|
+
hint: or --ff-only on the command line to override the configured default per
|
|
1354
|
+
hint: invocation.
|
|
1355
|
+
fatal: Need to specify how to reconcile divergent branches.
|
|
1356
|
+
|
|
1357
|
+
|
|
1358
|
+
────────────────────────────────────────────────────────────
|
|
1359
|
+
2026-03-08T05:15:01.670Z [run] started
|
|
1360
|
+
────────────────────────────────────────────────────────────
|
|
1361
|
+
2026-03-08T05:15:01.767Z [info] Fetching tasks (filter: all)...
|
|
1362
|
+
2026-03-08T05:15:02.231Z [info] Found 1 tagged task(s)
|
|
1363
|
+
2026-03-08T05:15:02.232Z [task] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" (status: review)
|
|
1364
|
+
2026-03-08T05:15:04.270Z [info] [86c8p2x53] "bugfix: sometimes you push to the wrong branch" skipped — branch already exists (86c8p2x53/bugfix-sometimes-you-push-to-the-wrong-branch) and no trigger word found
|
|
1365
|
+
2026-03-08T05:15:04.271Z [success] Done. Processed: 0, Skipped: 1
|
|
@@ -1,11 +1,49 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
39
|
const node_test_1 = require("node:test");
|
|
7
40
|
const strict_1 = __importDefault(require("node:assert/strict"));
|
|
41
|
+
const node_child_process_1 = require("node:child_process");
|
|
42
|
+
const fs = __importStar(require("node:fs"));
|
|
43
|
+
const os = __importStar(require("node:os"));
|
|
44
|
+
const path = __importStar(require("node:path"));
|
|
8
45
|
const git_1 = require("../git");
|
|
46
|
+
// ─── slugify ──────────────────────────────────────────────────────────────────
|
|
9
47
|
(0, node_test_1.describe)('slugify', () => {
|
|
10
48
|
(0, node_test_1.it)('lowercases input', () => {
|
|
11
49
|
strict_1.default.equal((0, git_1.slugify)('FIX LOGIN BUG'), 'fix-login-bug');
|
|
@@ -32,4 +70,242 @@ const git_1 = require("../git");
|
|
|
32
70
|
strict_1.default.equal((0, git_1.slugify)('!!!'), '');
|
|
33
71
|
});
|
|
34
72
|
});
|
|
73
|
+
// ─── isProtectedBranch ────────────────────────────────────────────────────────
|
|
74
|
+
(0, node_test_1.describe)('isProtectedBranch', () => {
|
|
75
|
+
(0, node_test_1.it)('recognizes main as protected', () => {
|
|
76
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('main'), true);
|
|
77
|
+
});
|
|
78
|
+
(0, node_test_1.it)('recognizes master as protected', () => {
|
|
79
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('master'), true);
|
|
80
|
+
});
|
|
81
|
+
(0, node_test_1.it)('recognizes develop as protected', () => {
|
|
82
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('develop'), true);
|
|
83
|
+
});
|
|
84
|
+
(0, node_test_1.it)('recognizes production as protected', () => {
|
|
85
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('production'), true);
|
|
86
|
+
});
|
|
87
|
+
(0, node_test_1.it)('is case-insensitive', () => {
|
|
88
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('MAIN'), true);
|
|
89
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('Master'), true);
|
|
90
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('DEVELOP'), true);
|
|
91
|
+
});
|
|
92
|
+
(0, node_test_1.it)('does not flag feature branches', () => {
|
|
93
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('feature/login'), false);
|
|
94
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('abc123/fix-bug'), false);
|
|
95
|
+
strict_1.default.equal((0, git_1.isProtectedBranch)('hotfix/urgent'), false);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
// ─── Integration tests using temp git repos ───────────────────────────────────
|
|
99
|
+
function gitCmd(args, cwd) {
|
|
100
|
+
const result = (0, node_child_process_1.spawnSync)('git', args, { cwd, encoding: 'utf8' });
|
|
101
|
+
if (result.status !== 0) {
|
|
102
|
+
throw new Error(`git ${args.join(' ')} failed: ${result.stderr}`);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
function initRepo(dir) {
|
|
106
|
+
gitCmd(['init', '-b', 'main'], dir);
|
|
107
|
+
gitCmd(['config', 'user.email', 'test@test.com'], dir);
|
|
108
|
+
gitCmd(['config', 'user.name', 'Test'], dir);
|
|
109
|
+
fs.writeFileSync(path.join(dir, 'README.md'), '# test\n');
|
|
110
|
+
gitCmd(['add', '.'], dir);
|
|
111
|
+
gitCmd(['commit', '-m', 'initial commit'], dir);
|
|
112
|
+
}
|
|
113
|
+
(0, node_test_1.describe)('getCurrentBranch (integration)', () => {
|
|
114
|
+
let tmpDir;
|
|
115
|
+
let originalCwd;
|
|
116
|
+
(0, node_test_1.beforeEach)(() => {
|
|
117
|
+
originalCwd = process.cwd();
|
|
118
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-git-test-'));
|
|
119
|
+
initRepo(tmpDir);
|
|
120
|
+
process.chdir(tmpDir);
|
|
121
|
+
});
|
|
122
|
+
(0, node_test_1.afterEach)(() => {
|
|
123
|
+
process.chdir(originalCwd);
|
|
124
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
125
|
+
});
|
|
126
|
+
(0, node_test_1.it)('returns the current branch name', () => {
|
|
127
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'main');
|
|
128
|
+
});
|
|
129
|
+
(0, node_test_1.it)('returns the new branch after checkout -b', () => {
|
|
130
|
+
gitCmd(['checkout', '-b', 'feature/test'], tmpDir);
|
|
131
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'feature/test');
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
(0, node_test_1.describe)('createBranch with expectedBase (integration)', () => {
|
|
135
|
+
let tmpDir;
|
|
136
|
+
let originalCwd;
|
|
137
|
+
(0, node_test_1.beforeEach)(() => {
|
|
138
|
+
originalCwd = process.cwd();
|
|
139
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-git-test-'));
|
|
140
|
+
initRepo(tmpDir);
|
|
141
|
+
process.chdir(tmpDir);
|
|
142
|
+
});
|
|
143
|
+
(0, node_test_1.afterEach)(() => {
|
|
144
|
+
process.chdir(originalCwd);
|
|
145
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
146
|
+
});
|
|
147
|
+
(0, node_test_1.it)('succeeds when on the expected base branch', () => {
|
|
148
|
+
strict_1.default.equal((0, git_1.createBranch)('task123/fix-bug', 'main'), true);
|
|
149
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'task123/fix-bug');
|
|
150
|
+
});
|
|
151
|
+
(0, node_test_1.it)('fails when not on the expected base branch', () => {
|
|
152
|
+
gitCmd(['checkout', '-b', 'some-other-branch'], tmpDir);
|
|
153
|
+
strict_1.default.equal((0, git_1.createBranch)('task123/fix-bug', 'main'), false);
|
|
154
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'some-other-branch');
|
|
155
|
+
});
|
|
156
|
+
(0, node_test_1.it)('works without expectedBase (backward compatible)', () => {
|
|
157
|
+
strict_1.default.equal((0, git_1.createBranch)('task123/fix-bug'), true);
|
|
158
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'task123/fix-bug');
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
(0, node_test_1.describe)('commit with expectedBranch (integration)', () => {
|
|
162
|
+
let tmpDir;
|
|
163
|
+
let originalCwd;
|
|
164
|
+
(0, node_test_1.beforeEach)(() => {
|
|
165
|
+
originalCwd = process.cwd();
|
|
166
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-git-test-'));
|
|
167
|
+
initRepo(tmpDir);
|
|
168
|
+
process.chdir(tmpDir);
|
|
169
|
+
});
|
|
170
|
+
(0, node_test_1.afterEach)(() => {
|
|
171
|
+
process.chdir(originalCwd);
|
|
172
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
173
|
+
});
|
|
174
|
+
(0, node_test_1.it)('succeeds when on the expected branch', () => {
|
|
175
|
+
gitCmd(['checkout', '-b', 'task123/fix-bug'], tmpDir);
|
|
176
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'content');
|
|
177
|
+
strict_1.default.equal((0, git_1.addAll)(), true);
|
|
178
|
+
strict_1.default.equal((0, git_1.commit)('test commit', 'task123/fix-bug'), true);
|
|
179
|
+
});
|
|
180
|
+
(0, node_test_1.it)('fails when on a different branch than expected', () => {
|
|
181
|
+
gitCmd(['checkout', '-b', 'task123/fix-bug'], tmpDir);
|
|
182
|
+
gitCmd(['checkout', '-b', 'wrong-branch'], tmpDir);
|
|
183
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'content');
|
|
184
|
+
strict_1.default.equal((0, git_1.addAll)(), true);
|
|
185
|
+
strict_1.default.equal((0, git_1.commit)('test commit', 'task123/fix-bug'), false);
|
|
186
|
+
});
|
|
187
|
+
(0, node_test_1.it)('refuses to commit when expectedBranch is a protected branch', () => {
|
|
188
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'content');
|
|
189
|
+
strict_1.default.equal((0, git_1.addAll)(), true);
|
|
190
|
+
strict_1.default.equal((0, git_1.commit)('test commit', 'main'), false);
|
|
191
|
+
});
|
|
192
|
+
(0, node_test_1.it)('works without expectedBranch (backward compatible)', () => {
|
|
193
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'content');
|
|
194
|
+
strict_1.default.equal((0, git_1.addAll)(), true);
|
|
195
|
+
strict_1.default.equal((0, git_1.commit)('test commit'), true);
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
(0, node_test_1.describe)('push validation (integration)', () => {
|
|
199
|
+
let tmpDir;
|
|
200
|
+
let bareDir;
|
|
201
|
+
let originalCwd;
|
|
202
|
+
(0, node_test_1.beforeEach)(() => {
|
|
203
|
+
originalCwd = process.cwd();
|
|
204
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-git-test-'));
|
|
205
|
+
bareDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-bare-'));
|
|
206
|
+
gitCmd(['init', '--bare', '-b', 'main'], bareDir);
|
|
207
|
+
initRepo(tmpDir);
|
|
208
|
+
gitCmd(['remote', 'add', 'origin', bareDir], tmpDir);
|
|
209
|
+
gitCmd(['push', 'origin', 'main'], tmpDir);
|
|
210
|
+
process.chdir(tmpDir);
|
|
211
|
+
});
|
|
212
|
+
(0, node_test_1.afterEach)(() => {
|
|
213
|
+
process.chdir(originalCwd);
|
|
214
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
215
|
+
fs.rmSync(bareDir, { recursive: true, force: true });
|
|
216
|
+
});
|
|
217
|
+
(0, node_test_1.it)('refuses to push to a protected branch', () => {
|
|
218
|
+
strict_1.default.equal((0, git_1.push)('origin', 'main'), false);
|
|
219
|
+
});
|
|
220
|
+
(0, node_test_1.it)('refuses to push when current branch does not match target', () => {
|
|
221
|
+
gitCmd(['checkout', '-b', 'task123/fix-bug'], tmpDir);
|
|
222
|
+
strict_1.default.equal((0, git_1.push)('origin', 'task456/other-task'), false);
|
|
223
|
+
});
|
|
224
|
+
(0, node_test_1.it)('succeeds when current branch matches target and is not protected', () => {
|
|
225
|
+
gitCmd(['checkout', '-b', 'task123/fix-bug'], tmpDir);
|
|
226
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'content');
|
|
227
|
+
gitCmd(['add', '.'], tmpDir);
|
|
228
|
+
gitCmd(['commit', '-m', 'add file'], tmpDir);
|
|
229
|
+
strict_1.default.equal((0, git_1.push)('origin', 'task123/fix-bug'), true);
|
|
230
|
+
});
|
|
231
|
+
(0, node_test_1.it)('uses explicit HEAD refspec so stale local branches are not pushed', () => {
|
|
232
|
+
gitCmd(['checkout', '-b', 'task123/fix-bug'], tmpDir);
|
|
233
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'v1');
|
|
234
|
+
gitCmd(['add', '.'], tmpDir);
|
|
235
|
+
gitCmd(['commit', '-m', 'v1'], tmpDir);
|
|
236
|
+
strict_1.default.equal((0, git_1.push)('origin', 'task123/fix-bug'), true);
|
|
237
|
+
fs.writeFileSync(path.join(tmpDir, 'file.txt'), 'v2');
|
|
238
|
+
gitCmd(['add', '.'], tmpDir);
|
|
239
|
+
gitCmd(['commit', '-m', 'v2'], tmpDir);
|
|
240
|
+
strict_1.default.equal((0, git_1.push)('origin', 'task123/fix-bug'), true);
|
|
241
|
+
const log = (0, node_child_process_1.spawnSync)('git', ['log', '--oneline', 'origin/task123/fix-bug'], {
|
|
242
|
+
cwd: tmpDir,
|
|
243
|
+
encoding: 'utf8',
|
|
244
|
+
});
|
|
245
|
+
strict_1.default.ok(log.stdout.includes('v2'));
|
|
246
|
+
});
|
|
247
|
+
});
|
|
248
|
+
(0, node_test_1.describe)('fetchAndCheckout sync verification (integration)', () => {
|
|
249
|
+
let tmpDir;
|
|
250
|
+
let bareDir;
|
|
251
|
+
let originalCwd;
|
|
252
|
+
(0, node_test_1.beforeEach)(() => {
|
|
253
|
+
originalCwd = process.cwd();
|
|
254
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-git-test-'));
|
|
255
|
+
bareDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-bare-'));
|
|
256
|
+
gitCmd(['init', '--bare', '-b', 'main'], bareDir);
|
|
257
|
+
initRepo(tmpDir);
|
|
258
|
+
gitCmd(['remote', 'add', 'origin', bareDir], tmpDir);
|
|
259
|
+
gitCmd(['push', 'origin', 'main'], tmpDir);
|
|
260
|
+
process.chdir(tmpDir);
|
|
261
|
+
});
|
|
262
|
+
(0, node_test_1.afterEach)(() => {
|
|
263
|
+
process.chdir(originalCwd);
|
|
264
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
265
|
+
fs.rmSync(bareDir, { recursive: true, force: true });
|
|
266
|
+
});
|
|
267
|
+
(0, node_test_1.it)('succeeds when local main matches origin/main', () => {
|
|
268
|
+
gitCmd(['checkout', '-b', 'feature/test'], tmpDir);
|
|
269
|
+
strict_1.default.equal((0, git_1.fetchAndCheckout)('origin', 'main'), true);
|
|
270
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'main');
|
|
271
|
+
});
|
|
272
|
+
(0, node_test_1.it)('succeeds when origin has new commits (fast-forward)', () => {
|
|
273
|
+
const cloneDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-clone-'));
|
|
274
|
+
try {
|
|
275
|
+
gitCmd(['clone', bareDir, cloneDir], cloneDir);
|
|
276
|
+
gitCmd(['config', 'user.email', 'other@test.com'], cloneDir);
|
|
277
|
+
gitCmd(['config', 'user.name', 'Other'], cloneDir);
|
|
278
|
+
fs.writeFileSync(path.join(cloneDir, 'new.txt'), 'from clone');
|
|
279
|
+
gitCmd(['add', '.'], cloneDir);
|
|
280
|
+
gitCmd(['commit', '-m', 'remote commit'], cloneDir);
|
|
281
|
+
gitCmd(['push', 'origin', 'main'], cloneDir);
|
|
282
|
+
}
|
|
283
|
+
finally {
|
|
284
|
+
fs.rmSync(cloneDir, { recursive: true, force: true });
|
|
285
|
+
}
|
|
286
|
+
gitCmd(['checkout', '-b', 'feature/test'], tmpDir);
|
|
287
|
+
strict_1.default.equal((0, git_1.fetchAndCheckout)('origin', 'main'), true);
|
|
288
|
+
strict_1.default.equal((0, git_1.getCurrentBranch)(), 'main');
|
|
289
|
+
});
|
|
290
|
+
(0, node_test_1.it)('fails when local main has diverged from origin/main', () => {
|
|
291
|
+
const cloneDir = fs.mkdtempSync(path.join(os.tmpdir(), 'aidev-clone-'));
|
|
292
|
+
try {
|
|
293
|
+
gitCmd(['clone', bareDir, cloneDir], cloneDir);
|
|
294
|
+
gitCmd(['config', 'user.email', 'other@test.com'], cloneDir);
|
|
295
|
+
gitCmd(['config', 'user.name', 'Other'], cloneDir);
|
|
296
|
+
fs.writeFileSync(path.join(cloneDir, 'remote.txt'), 'from clone');
|
|
297
|
+
gitCmd(['add', '.'], cloneDir);
|
|
298
|
+
gitCmd(['commit', '-m', 'remote commit'], cloneDir);
|
|
299
|
+
gitCmd(['push', 'origin', 'main'], cloneDir);
|
|
300
|
+
}
|
|
301
|
+
finally {
|
|
302
|
+
fs.rmSync(cloneDir, { recursive: true, force: true });
|
|
303
|
+
}
|
|
304
|
+
fs.writeFileSync(path.join(tmpDir, 'local.txt'), 'local only');
|
|
305
|
+
gitCmd(['add', '.'], tmpDir);
|
|
306
|
+
gitCmd(['commit', '-m', 'local commit'], tmpDir);
|
|
307
|
+
// pull will create a merge commit, making local ahead of origin/main
|
|
308
|
+
strict_1.default.equal((0, git_1.fetchAndCheckout)('origin', 'main'), false);
|
|
309
|
+
});
|
|
310
|
+
});
|
|
35
311
|
//# sourceMappingURL=git.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.test.js","sourceRoot":"","sources":["../../src/__tests__/git.test.ts"],"names":[],"mappings":";;;;;AAAA,yCAAyC;AACzC,gEAAwC;AACxC,gCAAiC;AAEjC,IAAA,oBAAQ,EAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAA,cAAE,EAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,eAAe,CAAC,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,eAAe,CAAC,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,0BAA0B,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,eAAe,CAAC,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAA,cAAE,EAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,gBAAM,CAAC,KAAK,CAAC,IAAA,aAAO,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"git.test.js","sourceRoot":"","sources":["../../src/__tests__/git.test.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/run.js
CHANGED
|
@@ -282,7 +282,7 @@ async function implementTask(task, branchName, branchExists, config, provider, r
|
|
|
282
282
|
await provider.postComment(task.id, '[aidev] Failed to prepare git branch. Manual intervention needed.');
|
|
283
283
|
return;
|
|
284
284
|
}
|
|
285
|
-
if (!git.createBranch(branchName)) {
|
|
285
|
+
if (!git.createBranch(branchName, config.githubBaseBranch)) {
|
|
286
286
|
logger_1.logger.error(`Failed to create branch ${branchName}`);
|
|
287
287
|
return;
|
|
288
288
|
}
|
|
@@ -331,7 +331,7 @@ async function implementTask(task, branchName, branchExists, config, provider, r
|
|
|
331
331
|
return;
|
|
332
332
|
}
|
|
333
333
|
// Commit and push
|
|
334
|
-
if (!git.addAll() || !git.commit(`[aidev] Implement: ${task.name}\n\nTask: ${task.url}
|
|
334
|
+
if (!git.addAll() || !git.commit(`[aidev] Implement: ${task.name}\n\nTask: ${task.url}`, branchName)) {
|
|
335
335
|
logger_1.logger.error('Failed to commit changes');
|
|
336
336
|
return;
|
|
337
337
|
}
|
|
@@ -497,7 +497,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
|
|
|
497
497
|
await provider.postComment(task.id, '[aidev] Failed to prepare git branch. Manual intervention needed.');
|
|
498
498
|
return;
|
|
499
499
|
}
|
|
500
|
-
if (!git.createBranch(branchName)) {
|
|
500
|
+
if (!git.createBranch(branchName, config.githubBaseBranch)) {
|
|
501
501
|
logger_1.logger.error(`Failed to create branch ${branchName}`);
|
|
502
502
|
return;
|
|
503
503
|
}
|
|
@@ -554,7 +554,7 @@ async function implementThinkingTask(task, branchName, branchExists, config, pro
|
|
|
554
554
|
catch { /* ignore */ }
|
|
555
555
|
break;
|
|
556
556
|
}
|
|
557
|
-
if (!git.addAll() || !git.commit(`[aidev] Step ${subtask.id}: ${subtask.title}\n\nTask: ${task.url}
|
|
557
|
+
if (!git.addAll() || !git.commit(`[aidev] Step ${subtask.id}: ${subtask.title}\n\nTask: ${task.url}`, branchName)) {
|
|
558
558
|
subtask.status = 'failed';
|
|
559
559
|
writeTaskPlan(plan);
|
|
560
560
|
allSucceeded = false;
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
package/dist/git.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
export declare function isProtectedBranch(branch: string): boolean;
|
|
2
|
+
export declare function getCurrentBranch(): string | null;
|
|
1
3
|
export declare function remoteBranchExists(remote: string, branch: string): boolean;
|
|
2
4
|
export declare function fetchAndCheckout(remote: string, baseBranch: string): boolean;
|
|
3
5
|
export declare function fetchAndCheckoutBranch(remote: string, branch: string): boolean;
|
|
4
|
-
export declare function createBranch(branch: string): boolean;
|
|
6
|
+
export declare function createBranch(branch: string, expectedBase?: string): boolean;
|
|
5
7
|
export declare function hasChanges(): boolean;
|
|
6
8
|
export declare function addAll(): boolean;
|
|
7
|
-
export declare function commit(message: string): boolean;
|
|
9
|
+
export declare function commit(message: string, expectedBranch?: string): boolean;
|
|
8
10
|
export declare function push(remote: string, branch: string): boolean;
|
|
9
11
|
export declare function deleteBranch(branch: string): void;
|
|
10
12
|
/** Returns the name of the first usable remote (prefers origin). */
|
package/dist/git.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"AAiBA,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAIhD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAG1E;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAkC5E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CA0B9E;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAiB3E;AAED,wBAAgB,UAAU,IAAI,OAAO,CAGpC;AAED,wBAAgB,MAAM,IAAI,OAAO,CAGhC;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAmBxE;AAED,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAiB5D;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAGjD;AAED,oEAAoE;AACpE,wBAAgB,YAAY,IAAI,MAAM,GAAG,IAAI,CAS5C;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM5C"}
|
package/dist/git.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isProtectedBranch = isProtectedBranch;
|
|
4
|
+
exports.getCurrentBranch = getCurrentBranch;
|
|
3
5
|
exports.remoteBranchExists = remoteBranchExists;
|
|
4
6
|
exports.fetchAndCheckout = fetchAndCheckout;
|
|
5
7
|
exports.fetchAndCheckoutBranch = fetchAndCheckoutBranch;
|
|
@@ -24,6 +26,16 @@ function git(args, cwd) {
|
|
|
24
26
|
status: result.status ?? 1,
|
|
25
27
|
};
|
|
26
28
|
}
|
|
29
|
+
const PROTECTED_BRANCHES = new Set(['main', 'master', 'develop', 'production']);
|
|
30
|
+
function isProtectedBranch(branch) {
|
|
31
|
+
return PROTECTED_BRANCHES.has(branch.toLowerCase());
|
|
32
|
+
}
|
|
33
|
+
function getCurrentBranch() {
|
|
34
|
+
const result = git(['rev-parse', '--abbrev-ref', 'HEAD']);
|
|
35
|
+
if (result.status !== 0)
|
|
36
|
+
return null;
|
|
37
|
+
return result.stdout.trim() || null;
|
|
38
|
+
}
|
|
27
39
|
function remoteBranchExists(remote, branch) {
|
|
28
40
|
const result = git(['ls-remote', '--heads', remote, branch]);
|
|
29
41
|
return result.status === 0 && result.stdout.trim().length > 0;
|
|
@@ -47,6 +59,14 @@ function fetchAndCheckout(remote, baseBranch) {
|
|
|
47
59
|
logger_1.logger.error(`git pull failed: ${pull.stderr}`);
|
|
48
60
|
return false;
|
|
49
61
|
}
|
|
62
|
+
const localRev = git(['rev-parse', 'HEAD']);
|
|
63
|
+
const remoteRev = git(['rev-parse', `${remote}/${baseBranch}`]);
|
|
64
|
+
if (localRev.status === 0 && remoteRev.status === 0 &&
|
|
65
|
+
localRev.stdout.trim() !== remoteRev.stdout.trim()) {
|
|
66
|
+
logger_1.logger.error(`Local ${baseBranch} is out of sync with ${remote}/${baseBranch} after pull — ` +
|
|
67
|
+
'local branch may have diverged. Please resolve manually.');
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
50
70
|
return true;
|
|
51
71
|
}
|
|
52
72
|
function fetchAndCheckoutBranch(remote, branch) {
|
|
@@ -74,7 +94,14 @@ function fetchAndCheckoutBranch(remote, branch) {
|
|
|
74
94
|
}
|
|
75
95
|
return true;
|
|
76
96
|
}
|
|
77
|
-
function createBranch(branch) {
|
|
97
|
+
function createBranch(branch, expectedBase) {
|
|
98
|
+
if (expectedBase) {
|
|
99
|
+
const current = getCurrentBranch();
|
|
100
|
+
if (current !== expectedBase) {
|
|
101
|
+
logger_1.logger.error(`Cannot create branch "${branch}": expected to be on "${expectedBase}" but currently on "${current}"`);
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
78
105
|
logger_1.logger.debug(`git checkout -b ${branch}`);
|
|
79
106
|
const result = git(['checkout', '-b', branch]);
|
|
80
107
|
if (result.status !== 0) {
|
|
@@ -91,7 +118,18 @@ function addAll() {
|
|
|
91
118
|
const result = git(['add', '-A']);
|
|
92
119
|
return result.status === 0;
|
|
93
120
|
}
|
|
94
|
-
function commit(message) {
|
|
121
|
+
function commit(message, expectedBranch) {
|
|
122
|
+
if (expectedBranch) {
|
|
123
|
+
const current = getCurrentBranch();
|
|
124
|
+
if (current !== expectedBranch) {
|
|
125
|
+
logger_1.logger.error(`Refusing to commit: expected branch "${expectedBranch}" but currently on "${current}"`);
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
if (isProtectedBranch(current)) {
|
|
129
|
+
logger_1.logger.error(`Refusing to commit directly to protected branch "${current}"`);
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
95
133
|
logger_1.logger.debug(`git commit -m "${message}"`);
|
|
96
134
|
const result = git(['commit', '-m', message]);
|
|
97
135
|
if (result.status !== 0) {
|
|
@@ -101,8 +139,17 @@ function commit(message) {
|
|
|
101
139
|
return true;
|
|
102
140
|
}
|
|
103
141
|
function push(remote, branch) {
|
|
104
|
-
|
|
105
|
-
|
|
142
|
+
const current = getCurrentBranch();
|
|
143
|
+
if (current !== branch) {
|
|
144
|
+
logger_1.logger.error(`Refusing to push: current branch "${current}" does not match target branch "${branch}"`);
|
|
145
|
+
return false;
|
|
146
|
+
}
|
|
147
|
+
if (isProtectedBranch(branch)) {
|
|
148
|
+
logger_1.logger.error(`Refusing to push directly to protected branch "${branch}"`);
|
|
149
|
+
return false;
|
|
150
|
+
}
|
|
151
|
+
logger_1.logger.debug(`git push ${remote} HEAD:refs/heads/${branch}`);
|
|
152
|
+
const result = git(['push', remote, `HEAD:refs/heads/${branch}`]);
|
|
106
153
|
if (result.status !== 0) {
|
|
107
154
|
logger_1.logger.error(`git push failed: ${result.stderr}`);
|
|
108
155
|
return false;
|
package/dist/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"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"}
|